* [PATCH] defaultenv/bin/boot: fix ubi root's name assignment
@ 2011-02-02 22:09 Marc Kleine-Budde
2011-02-02 22:14 ` Eric Bénard
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2011-02-02 22:09 UTC (permalink / raw)
To: barebox
[-- Attachment #1: Type: text/plain, Size: 732 bytes --]
This patch fixes a regression introduced in commit
d15cfafeef8f99ff1a47e77362d0adf1b07f26ae.
While there, use "-z" to check if ubiroot variable is empty.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Eric B�nard <eric@eukrea.com>
---
defaultenv/bin/boot | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index fa68748..788a781 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -34,8 +34,8 @@ else
fi
if [ x$rootfs_type = xubifs ]; then
- if [ x$ubiroot = x ]; then
- ubiroot = "root"
+ if [ -z $ubiroot ]; then
+ ubiroot="root"
fi
bootargs="$bootargs root=ubi0:$ubiroot ubi.mtd=$rootfs_mtdblock"
else
--
1.7.2.3
[-- Attachment #2: Type: text/plain, Size: 149 bytes --]
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] defaultenv/bin/boot: fix ubi root's name assignment
2011-02-02 22:09 [PATCH] defaultenv/bin/boot: fix ubi root's name assignment Marc Kleine-Budde
@ 2011-02-02 22:14 ` Eric Bénard
2011-02-02 22:18 ` Marc Kleine-Budde
0 siblings, 1 reply; 3+ messages in thread
From: Eric Bénard @ 2011-02-02 22:14 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: barebox
On 02/02/2011 23:09, Marc Kleine-Budde wrote:
> This patch fixes a regression introduced in commit
> d15cfafeef8f99ff1a47e77362d0adf1b07f26ae.
>
> While there, use "-z" to check if ubiroot variable is empty.
>
> Signed-off-by: Marc Kleine-Budde<mkl@pengutronix.de>
> Cc: Eric B�nard<eric@eukrea.com>
Acked-By: Eric Bénard<eric@eukrea.com>
and shame on me for not testing this part ...
Eric
> ---
> defaultenv/bin/boot | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
> index fa68748..788a781 100644
> --- a/defaultenv/bin/boot
> +++ b/defaultenv/bin/boot
> @@ -34,8 +34,8 @@ else
> fi
>
> if [ x$rootfs_type = xubifs ]; then
> - if [ x$ubiroot = x ]; then
> - ubiroot = "root"
> + if [ -z $ubiroot ]; then
> + ubiroot="root"
> fi
> bootargs="$bootargs root=ubi0:$ubiroot ubi.mtd=$rootfs_mtdblock"
> else
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] defaultenv/bin/boot: fix ubi root's name assignment
2011-02-02 22:14 ` Eric Bénard
@ 2011-02-02 22:18 ` Marc Kleine-Budde
0 siblings, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2011-02-02 22:18 UTC (permalink / raw)
To: Eric Bénard; +Cc: barebox
[-- Attachment #1.1: Type: text/plain, Size: 800 bytes --]
On 02/02/2011 11:14 PM, Eric Bénard wrote:
> On 02/02/2011 23:09, Marc Kleine-Budde wrote:
>> This patch fixes a regression introduced in commit
>> d15cfafeef8f99ff1a47e77362d0adf1b07f26ae.
>>
>> While there, use "-z" to check if ubiroot variable is empty.
>>
>> Signed-off-by: Marc Kleine-Budde<mkl@pengutronix.de>
>> Cc: Eric B�nard<eric@eukrea.com>
> Acked-By: Eric Bénard<eric@eukrea.com>
>
> and shame on me for not testing this part ...
Sascha, can you fix Eric's name, I fsck'ed it up :)
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]
[-- Attachment #2: Type: text/plain, Size: 149 bytes --]
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-02-02 22:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-02 22:09 [PATCH] defaultenv/bin/boot: fix ubi root's name assignment Marc Kleine-Budde
2011-02-02 22:14 ` Eric Bénard
2011-02-02 22:18 ` Marc Kleine-Budde
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox