From c38da2675bfd0c0c4e78cf65ef48295c75f6f16e Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Tue, 19 Mar 2013 15:15:02 -0700 Subject: 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 (From OE-Core rev: e5dbec7e7d3bb29676280823b0337ad429c75120) Signed-off-by: Darren Hart Cc: Koen Kooi Signed-off-by: Richard Purdie --- scripts/contrib/mkefidisk.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') 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. -- cgit v1.2.3-54-g00ecf