diff options
| author |   Darren Hart <dvhart@linux.intel.com> | 2013-03-19 15:15:02 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:51:16 +0000 |
| commit | e5dbec7e7d3bb29676280823b0337ad429c75120 (patch) | |
| tree | c0678ec1faca1ad195b5ef9a60dd23406bc3c234 /scripts | |
| parent | bde2c0ab1500976e2cb50f1526df04fb8b2cd408 (diff) | |
| download | openembedded-core-contrib-e5dbec7e7d3bb29676280823b0337ad429c75120.tar.gz | |
mkefidisk: Always specify a root= kernel parameter
The current script only replaces an existing root= kernel parameter
which can result images created without a root= paremeter, even though
the script expects a target rootfs parameter.
Rather than replacing the root= parameter, delete the root= parameter if
it exists, then append an appropriate root= parameter.
Fixes [YOCTO 4035] mkefidisk.sh forgets to add root= parameter
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/contrib/mkefidisk.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index b7db0a9134..40203ee9cc 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -250,8 +250,10 @@ sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG sed -i "/initrd /d" $GRUBCFG # Delete any LABEL= strings sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG -# Replace the ramdisk root with the install device and include other options -sed -i "s@ root=[^ ]*@ root=$TARGET_ROOTFS rw $ROOTWAIT quiet@" $GRUBCFG +# Replace the ramdisk root (if any) with the install device and include other +# kernel parameters +sed -i "s@ root=[^ ]*@ @" $GRUBCFG +sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS rw $ROOTWAIT quiet @" $GRUBCFG # Provide a startup.nsh script for older firmware with non-standard boot # directories and paths. |