diff options
| author | Darren Hart <dvhart@linux.intel.com> | 2013-09-23 20:54:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 11:56:15 +0100 |
| commit | 14b124122c1b7d10b9a3a96fe4617c6fc1c661c5 (patch) | |
| tree | 1e14513cbbc6d2d1b27d632914dee030afa9b313 /meta | |
| parent | 65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd (diff) | |
| download | openembedded-core-14b124122c1b7d10b9a3a96fe4617c6fc1c661c5.tar.gz openembedded-core-14b124122c1b7d10b9a3a96fe4617c6fc1c661c5.tar.bz2 openembedded-core-14b124122c1b7d10b9a3a96fe4617c6fc1c661c5.zip | |
init-install-efi.sh: Fix root= specification
Fixes [YOCTO #5237]
The current grub.cfg manipulation depends on an existing root=
parameter. If this doesn't exist, the correct root= parameter will not
be added.
Instead, remove any existing root= parameters and add the correct one
explicitly.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: mihaix.lindner@linux.intel.com
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 23228c92c4..574966e14e 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -161,8 +161,10 @@ sed -i "/menuentry 'install'/,/^}/d" $GRUBCFG sed -i "/initrd /d" $GRUBCFG # Delete any LABEL= strings sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG -# Replace the ramdisk root with the install device and include other options -sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG +# Delete any root= strings +sed -i "s/ root=[^ ]*/ /" $GRUBCFG +# Add the root= and other standard boot options +sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @" $GRUBCFG umount /ssd sync |