aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-04-01 02:14:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-01 15:03:23 +0100
commitca402bc3bc4e9a5c3e19a6ca504017335212b2c9 (patch)
treeef7cddea0ca50b5eb508fff1235be61522136038
parenta68ac76c1b6ed4c1a2fbc944c5021c89fd26217f (diff)
downloadopenembedded-core-contrib-ca402bc3bc4e9a5c3e19a6ca504017335212b2c9.tar.gz
openembedded-core-contrib-ca402bc3bc4e9a5c3e19a6ca504017335212b2c9.tar.bz2
openembedded-core-contrib-ca402bc3bc4e9a5c3e19a6ca504017335212b2c9.zip
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh2
1 files changed, 1 insertions, 1 deletions
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