summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files/init-install-efi.sh
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi.sh')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh12
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
246if [ -d /run/media/$1/loader ]; then 246if [ -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
261fi 261fi
262 262
263umount /tgt_root 263umount /tgt_root