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 17:24:14 +0100 |
commit | e42fefe717b242eed68d1ba7e7ee05d4aa3c4016 (patch) | |
tree | ca067b926721ac71503ff92c5ceaab979e83e24f | |
parent | cbc12aac86b882b4cdbb9d291d3c525f1d6e76d3 (diff) | |
download | poky-e42fefe717b242eed68d1ba7e7ee05d4aa3c4016.tar.gz |
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.
(From OE-Core rev: 14b124122c1b7d10b9a3a96fe4617c6fc1c661c5)
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>
-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 | |||
161 | sed -i "/initrd /d" $GRUBCFG | 161 | sed -i "/initrd /d" $GRUBCFG |
162 | # Delete any LABEL= strings | 162 | # Delete any LABEL= strings |
163 | sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG | 163 | sed -i "s/ LABEL=[^ ]*/ /" $GRUBCFG |
164 | # Replace the ramdisk root with the install device and include other options | 164 | # Delete any root= strings |
165 | sed -i "s@ root=[^ ]*@ root=$rootfs rw $rootwait quiet@" $GRUBCFG | 165 | sed -i "s/ root=[^ ]*/ /" $GRUBCFG |
166 | # Add the root= and other standard boot options | ||
167 | sed -i "s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @" $GRUBCFG | ||
166 | 168 | ||
167 | umount /ssd | 169 | umount /ssd |
168 | sync | 170 | sync |