From 14b124122c1b7d10b9a3a96fe4617c6fc1c661c5 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Mon, 23 Sep 2013 20:54:09 +0000 Subject: 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. Signed-off-by: Darren Hart Cc: mihaix.lindner@linux.intel.com Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh') diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 23228c92c4..574966e14e 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -161,8 +161,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=$rootfs rw $rootwait quiet@" $GRUBCFG +# Delete any root= strings +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 sync -- cgit v1.2.3