init-install-efi.sh: Fix root= specification
Fixes [YOCTO #5237] The current grub.cfg manipulation depends on an existing root= parameter. If this doesn't exist, the correct root= parameter will not be added. Instead, remove any existing root= parameters and add the correct one explicitly. (From OE-Core rev: 14b124122c1b7d10b9a3a96fe4617c6fc1c661c5) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: mihaix.lindner@linux.intel.com Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
cbc12aac86
commit
e42fefe717
|
@ -161,8 +161,10 @@ sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG
|
||||||
sed -i "/initrd /d" $GRUBCFG
|
sed -i "/initrd /d" $GRUBCFG
|
||||||
# Delete any LABEL= strings
|
# Delete any LABEL= strings
|
||||||
sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
|
sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG
|
||||||
# Replace the ramdisk root with the install device and include other options
|
# Delete any root= strings
|
||||||
sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG
|
sed -i "s/ root=[^ ]*/ /" $GRUBCFG
|
||||||
|
# Add the root= and other standard boot options
|
||||||
|
sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @" $GRUBCFG
|
||||||
|
|
||||||
umount /ssd
|
umount /ssd
|
||||||
sync
|
sync
|
||||||
|
|
Loading…
Reference in New Issue