From: Robert Yang Date: Fri, 1 Apr 2016 06:41:08 +0000 (-0700) Subject: init-install-efi.sh: remove all root=foo from grub.cfg X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1831ad4009390bec7442328bf4873d3ff33c6402;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git init-install-efi.sh: remove all root=foo from grub.cfg There might be more than one root=/dev/foo in the config file which would cause unepected errros on the installed target, so remove all of them. [YOCTO #9354] Signed-off-by: Robert Yang --- diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 3531158f3b7..d58826a2409 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -217,7 +217,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then # Delete any LABEL= strings sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG # Delete any root= strings - sed -i "s/ root=[^ ]*/ /" $GRUBCFG + sed -i "s/ root=[^ ]*/ /g" $GRUBCFG # Add the root= and other standard boot options sed -i "s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG fi