mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* Default environment patches
@ 2011-01-20  8:47 Sascha Hauer
  2011-01-20  8:47 ` [PATCH 1/2] defaultenv: only try to add partitions when partition description exists Sascha Hauer
  2011-01-20  8:47 ` [PATCH 2/2] defaultenv: do not print usage information for update script Sascha Hauer
  0 siblings, 2 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-01-20  8:47 UTC (permalink / raw)
  To: barebox

Two little updates to the default environment.

Sascha


The following changes since commit a45c3b961c7696e2f203f3fd981db78d92b747e6:

  at91sam9g45: fix ARCH_TEXT_BASE (2011-01-19 09:38:18 +0100)

are available in the git repository at:
  nowhere ..BRANCH.NOT.VERIFIED..

Sascha Hauer (2):
      defaultenv: only try to add partitions when partition description exists
      defaultenv: do not print usage information for update script

 defaultenv/bin/init |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] defaultenv: only try to add partitions when partition description exists
  2011-01-20  8:47 Default environment patches Sascha Hauer
@ 2011-01-20  8:47 ` Sascha Hauer
  2011-01-20  8:47 ` [PATCH 2/2] defaultenv: do not print usage information for update script Sascha Hauer
  1 sibling, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-01-20  8:47 UTC (permalink / raw)
  To: barebox

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 defaultenv/bin/init |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaultenv/bin/init b/defaultenv/bin/init
index 96a5716..877b541 100644
--- a/defaultenv/bin/init
+++ b/defaultenv/bin/init
@@ -4,15 +4,15 @@ PATH=/env/bin
 export PATH
 
 . /env/config
-if [ -e /dev/nor0 ]; then
+if [ -e /dev/nor0 -a -n "$nor_parts" ]; then
 	addpart /dev/nor0 $nor_parts
 fi
 
-if [ -e /dev/disk0 ]; then
+if [ -e /dev/disk0 -a -n "$disk_parts" ]; then
 	addpart /dev/disk0 $disk_parts
 fi
 
-if [ -e /dev/nand0 ]; then
+if [ -e /dev/nand0 -a -n "$nand_parts" ]; then
 	addpart /dev/nand0 $nand_parts
 
 	# Uh, oh, hush first expands wildcards and then starts executing
-- 
1.7.2.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] defaultenv: do not print usage information for update script
  2011-01-20  8:47 Default environment patches Sascha Hauer
  2011-01-20  8:47 ` [PATCH 1/2] defaultenv: only try to add partitions when partition description exists Sascha Hauer
@ 2011-01-20  8:47 ` Sascha Hauer
  2011-01-20  8:57   ` Eric Bénard
  2011-01-20 15:25   ` Jean-Christophe PLAGNIOL-VILLARD
  1 sibling, 2 replies; 6+ messages in thread
From: Sascha Hauer @ 2011-01-20  8:47 UTC (permalink / raw)
  To: barebox

This usage printout during startup more looks like there is
something wrong with the environment than a helpful message.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 defaultenv/bin/init |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/defaultenv/bin/init b/defaultenv/bin/init
index 877b541..b66f7d9 100644
--- a/defaultenv/bin/init
+++ b/defaultenv/bin/init
@@ -28,9 +28,6 @@ echo
 echo -n "Hit any key to stop autoboot: "
 timeout -a $autoboot_timeout
 if [ $? != 0 ]; then
-	echo
-	update -h
-	echo
 	exit
 fi
 
-- 
1.7.2.3


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] defaultenv: do not print usage information for update script
  2011-01-20  8:47 ` [PATCH 2/2] defaultenv: do not print usage information for update script Sascha Hauer
@ 2011-01-20  8:57   ` Eric Bénard
  2011-01-20 15:25   ` Jean-Christophe PLAGNIOL-VILLARD
  1 sibling, 0 replies; 6+ messages in thread
From: Eric Bénard @ 2011-01-20  8:57 UTC (permalink / raw)
  To: barebox

On 20/01/2011 09:47, Sascha Hauer wrote:
> This usage printout during startup more looks like there is
> something wrong with the environment than a helpful message.
>
> Signed-off-by: Sascha Hauer<s.hauer@pengutronix.de>
> Cc: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft.com>
Acked-by: Eric Bénard <eric@eukrea.com>
> ---
>   defaultenv/bin/init |    3 ---
>   1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/defaultenv/bin/init b/defaultenv/bin/init
> index 877b541..b66f7d9 100644
> --- a/defaultenv/bin/init
> +++ b/defaultenv/bin/init
> @@ -28,9 +28,6 @@ echo
>   echo -n "Hit any key to stop autoboot: "
>   timeout -a $autoboot_timeout
>   if [ $? != 0 ]; then
> -	echo
> -	update -h
> -	echo
>   	exit
>   fi
>


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] defaultenv: do not print usage information for update script
  2011-01-20  8:47 ` [PATCH 2/2] defaultenv: do not print usage information for update script Sascha Hauer
  2011-01-20  8:57   ` Eric Bénard
@ 2011-01-20 15:25   ` Jean-Christophe PLAGNIOL-VILLARD
  2011-01-20 15:37     ` Eric Bénard
  1 sibling, 1 reply; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2011-01-20 15:25 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

On 09:47 Thu 20 Jan     , Sascha Hauer wrote:
> This usage printout during startup more looks like there is
> something wrong with the environment than a helpful message.
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

but I'll print something at least

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] defaultenv: do not print usage information for update script
  2011-01-20 15:25   ` Jean-Christophe PLAGNIOL-VILLARD
@ 2011-01-20 15:37     ` Eric Bénard
  0 siblings, 0 replies; 6+ messages in thread
From: Eric Bénard @ 2011-01-20 15:37 UTC (permalink / raw)
  To: barebox

Hi Jean-Christophe,

On 20/01/2011 16:25, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 09:47 Thu 20 Jan     , Sascha Hauer wrote:
>> This usage printout during startup more looks like there is
>> something wrong with the environment than a helpful message.
>>
>> Signed-off-by: Sascha Hauer<s.hauer@pengutronix.de>
>> Cc: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft.com>
> Acked-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft.com>
>
> but I'll print something at least
>
you get my ack for a one line message like "autoboot failed"

Eric

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-01-20 15:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-20  8:47 Default environment patches Sascha Hauer
2011-01-20  8:47 ` [PATCH 1/2] defaultenv: only try to add partitions when partition description exists Sascha Hauer
2011-01-20  8:47 ` [PATCH 2/2] defaultenv: do not print usage information for update script Sascha Hauer
2011-01-20  8:57   ` Eric Bénard
2011-01-20 15:25   ` Jean-Christophe PLAGNIOL-VILLARD
2011-01-20 15:37     ` Eric Bénard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox