[oe-commits] [openembedded-core] 06/10: init-install-efi.sh: remove all root=foo from grub.cfg

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ca402bc3bc4e9a5c3e19a6ca504017335212b2c9
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Apr 1 02:14:45 2016 -0700

    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 <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/initrdscripts/files/init-install-efi.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 3531158..d58826a 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 at linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @" $GRUBCFG
 fi

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.