aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-31 23:41:08 -0700
committerRobert Yang <liezhi.yang@windriver.com>2016-04-01 23:13:56 -0700
commit1831ad4009390bec7442328bf4873d3ff33c6402 (patch)
treedfbb7e29b76943e60833df0b7dafda545c074308
parent745a7562c829171ff677a201777fe330a1cebdc6 (diff)
downloadopenembedded-core-contrib-1831ad4009390bec7442328bf4873d3ff33c6402.tar.gz
openembedded-core-contrib-1831ad4009390bec7442328bf4873d3ff33c6402.tar.bz2
openembedded-core-contrib-1831ad4009390bec7442328bf4873d3ff33c6402.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>
-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 3531158f3b..d58826a240 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