diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-04-01 02:14:45 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-03 15:51:35 +0100 |
| commit | 1f2a01b02e9e175cad4cf05b3ff7430bba232eb6 (patch) | |
| tree | c58bb5b7b14429a12a89f71489e5266fc61c341f | |
| parent | 3ce7d8cdc8537fef07efc2d3f6b540faab1819e4 (diff) | |
| download | openembedded-core-contrib-1f2a01b02e9e175cad4cf05b3ff7430bba232eb6.tar.gz | |
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]
(From OE-Core rev: ca402bc3bc4e9a5c3e19a6ca504017335212b2c9)
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.sh | 2 |
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 |