sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Darren Hart 2013-03-19 15:15:02 -07:00 committed by Richard Purdie
parent 403d969678
commit c38da2675b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/contrib/mkefidisk.sh
View File

@ -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.