summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh12
1 files changed, 6 insertions, 6 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
171fi 171fi
172 172
173if [ -d /run/media/$1/loader ]; then 173if [ -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
189fi 189fi