examples: factor out code to install systemd-boot

All of the examples do this (except for unified-secureboot, which wants
to install a signed copy) so factor it out.

Signed-off-by: Allison Karlitskaya <[email protected]>

Author: allisonkarlitskaya

examples/bls/build

@@ -57,11 +57,6 @@ mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/upper"
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/var"
 
-mkdir -p tmp/efi/loader
-echo 'timeout 3' > tmp/efi/loader/loader.conf
-mkdir -p tmp/efi/EFI/BOOT tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/BOOT/BOOTX64.EFI
 ${CFSCTL} oci prepare-boot "${BASE_ID}" tmp/efi
 
 OPTIONS="console=ttyS0,115200 composefs=${BASE_IMAGE_FSVERITY} rw"
@@ -74,4 +69,5 @@ else
 fi
 sed -i 's@ /boot/@ /@' "${BLE}"
 
+../common/install-systemd-boot
 ../common/make-image "${os}-bls-efi.qcow2"

examples/common/install-systemd-boot

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -eux
+
+mkdir -p tmp/efi/loader
+echo 'timeout 3' > tmp/efi/loader/loader.conf
+mkdir -p tmp/efi/EFI/BOOT tmp/efi/EFI/systemd
+cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/systemd
+cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/BOOT/BOOTX64.EFI

examples/uki/build

@@ -64,11 +64,7 @@ mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/etc/upper"
 mkdir -p "tmp/sysroot/state/${BASE_IMAGE_FSVERITY}/var"
 
-mkdir -p tmp/efi/loader
-echo 'timeout 3' > tmp/efi/loader/loader.conf
-mkdir -p tmp/efi/EFI/BOOT tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/BOOT/BOOTX64.EFI
 ${CFSCTL} oci prepare-boot "${FINAL_ID}" tmp/efi
 
+../common/install-systemd-boot
 ../common/make-image "${os}-uki-efi.qcow2"

examples/unified-secureboot/build

@@ -55,13 +55,15 @@ mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/upper"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/var"
 
+${CFSCTL} oci prepare-boot "${IMAGE_ID}" tmp/efi
+
+# install a signed copy of systemd-boot
 mkdir -p tmp/efi/loader
 echo 'timeout 3' > tmp/efi/loader/loader.conf
 mkdir -p tmp/efi/EFI/BOOT tmp/efi/EFI/systemd
 sbsign --key secureboot/db.key --cert secureboot/db.crt \
     /usr/lib/systemd/boot/efi/systemd-bootx64.efi \
     --output tmp/efi/EFI/systemd/systemd-bootx64.efi
 cp tmp/efi/EFI/{systemd/systemd-bootx64.efi,BOOT/BOOTX64.EFI}
-${CFSCTL} oci prepare-boot "${IMAGE_ID}" tmp/efi
 
 ../common/make-image fedora-unified-secureboot-efi.qcow2

examples/unified/build

@@ -37,11 +37,7 @@ mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/work"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/etc/upper"
 mkdir -p "tmp/sysroot/state/${IMAGE_FSVERITY}/var"
 
-mkdir -p tmp/efi/loader
-echo 'timeout 3' > tmp/efi/loader/loader.conf
-mkdir -p tmp/efi/EFI/BOOT tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/systemd
-cp /usr/lib/systemd/boot/efi/systemd-bootx64.efi tmp/efi/EFI/BOOT/BOOTX64.EFI
 ${CFSCTL} oci prepare-boot "${IMAGE_ID}" tmp/efi
 
+../common/install-systemd-boot
 ../common/make-image fedora-unified-efi.qcow2