diff options
author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-11-23 16:53:30 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:11 +0000 |
commit | 2dce2648e3d8c7c9d78a56d96be4401deccaa2f2 (patch) | |
tree | 05674a5b65771aa3c310269a58e585f8f3aeaee4 /meta/recipes-core/initrdscripts/files/init-install-efi.sh | |
parent | 41137c212cbc47e382dae5ce3de4f8217c2b5c4c (diff) | |
download | poky-2dce2648e3d8c7c9d78a56d96be4401deccaa2f2.tar.gz |
gummiboot: Remove/change gummiboot references with systemd-boot
After systemd-boot was introduced, its been tested for a while with no major
issues being found until now, this patch completely replaces all gummiboot
instances with systemd-boot ones, taking the next step into cleaning
up systemd-boot/gummiboot.
[YOCTO #10332]
(From OE-Core rev: f9a61d3400ad9068a6d83b8eb6aefe3098c58e68)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index ffb709c1ce..5ad3a60c05 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -245,19 +245,19 @@ fi | |||
245 | 245 | ||
246 | if [ -d /run/media/$1/loader ]; then | 246 | if [ -d /run/media/$1/loader ]; then |
247 | rootuuid=$(blkid -o value -s PARTUUID ${rootfs}) | 247 | rootuuid=$(blkid -o value -s PARTUUID ${rootfs}) |
248 | GUMMIBOOT_CFGS="/boot/loader/entries/*.conf" | 248 | SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf" |
249 | # copy config files for gummiboot | 249 | # copy config files for systemd-boot |
250 | cp -dr /run/media/$1/loader /boot | 250 | cp -dr /run/media/$1/loader /boot |
251 | # delete the install entry | 251 | # delete the install entry |
252 | rm -f /boot/loader/entries/install.conf | 252 | rm -f /boot/loader/entries/install.conf |
253 | # delete the initrd lines | 253 | # delete the initrd lines |
254 | sed -i "/initrd /d" $GUMMIBOOT_CFGS | 254 | sed -i "/initrd /d" $SYSTEMDBOOT_CFGS |
255 | # delete any LABEL= strings | 255 | # delete any LABEL= strings |
256 | sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS | 256 | sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS |
257 | # delete any root= strings | 257 | # delete any root= strings |
258 | sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS | 258 | sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS |
259 | # add the root= and other standard boot options | 259 | # add the root= and other standard boot options |
260 | sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $GUMMIBOOT_CFGS | 260 | sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS |
261 | fi | 261 | fi |
262 | 262 | ||
263 | umount /tgt_root | 263 | umount /tgt_root |