diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 12 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh index b562109157..9c4b263d54 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | |||
@@ -171,19 +171,19 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then | |||
171 | fi | 171 | fi |
172 | 172 | ||
173 | if [ -d /run/media/$1/loader ]; then | 173 | if [ -d /run/media/$1/loader ]; then |
174 | GUMMIBOOT_CFGS="/ssd/loader/entries/*.conf" | 174 | SYSTEMDBOOT_CFGS="/ssd/loader/entries/*.conf" |
175 | # copy config files for gummiboot | 175 | # copy config files for systemd-boot |
176 | cp -dr /run/media/$1/loader /ssd | 176 | cp -dr /run/media/$1/loader /ssd |
177 | # delete the install entry | 177 | # delete the install entry |
178 | rm -f /ssd/loader/entries/install.conf | 178 | rm -f /ssd/loader/entries/install.conf |
179 | # delete the initrd lines | 179 | # delete the initrd lines |
180 | sed -i "/initrd /d" $GUMMIBOOT_CFGS | 180 | sed -i "/initrd /d" $SYSTEMDBOOT_CFGS |
181 | # delete any LABEL= strings | 181 | # delete any LABEL= strings |
182 | sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS | 182 | sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS |
183 | # delete any root= strings | 183 | # delete any root= strings |
184 | sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS | 184 | sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS |
185 | # add the root= and other standard boot options | 185 | # add the root= and other standard boot options |
186 | sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $GUMMIBOOT_CFGS | 186 | sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $SYSTEMDBOOT_CFGS |
187 | # Add the test label | 187 | # Add the test label |
188 | echo -ne "title test\nlinux /test-kernel\noptions root=$testfs rw $rootwait quiet\n" > /ssd/loader/entries/test.conf | 188 | echo -ne "title test\nlinux /test-kernel\noptions root=$testfs rw $rootwait quiet\n" > /ssd/loader/entries/test.conf |
189 | fi | 189 | fi |
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 |