summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2013-03-19 15:15:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:38 +0000
commitc38da2675bfd0c0c4e78cf65ef48295c75f6f16e (patch)
treec4bec1e33c9a3be7c65ca841de12916272f6f131
parent403d9696781852d91cfe002419c2bd48f9da933c (diff)
downloadpoky-c38da2675bfd0c0c4e78cf65ef48295c75f6f16e.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 (From OE-Core rev: e5dbec7e7d3bb29676280823b0337ad429c75120) 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>
-rwxr-xr-xscripts/contrib/mkefidisk.sh6
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
250sed -i "/initrd /d" $GRUBCFG 250sed -i "/initrd /d" $GRUBCFG
251# Delete any LABEL= strings 251# Delete any LABEL= strings
252sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG 252sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
253# Replace the ramdisk root with the install device and include other options 253# Replace the ramdisk root (if any) with the install device and include other
254sed -i "s@ root=[^ ]*@ root=$TARGET_ROOTFS rw $ROOTWAIT quiet@" $GRUBCFG 254# kernel parameters
255sed -i "s@ root=[^ ]*@ @" $GRUBCFG
256sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS rw $ROOTWAIT quiet @" $GRUBCFG
255 257
256# Provide a startup.nsh script for older firmware with non-standard boot 258# Provide a startup.nsh script for older firmware with non-standard boot
257# directories and paths. 259# directories and paths.