Skip to content

Commit 9b9962e

Browse files
committed
provisioner: Use helper functions instead of paths
1 parent 88da441 commit 9b9962e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

device-provisioner/provisioner.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ case ${RPI_DEVICE_FAMILY} in
205205
;;
206206
esac
207207

208-
cp /var/lib/rpi-sb-provisioner/fastboot-gadget.img "${RPI_SB_WORKDIR}"/boot.img
208+
cp "$(get_fastboot_gadget)" "${RPI_SB_WORKDIR}"/boot.img
209209

210-
cp /var/lib/rpi-sb-provisioner/boot_ramdisk_config.txt "${RPI_SB_WORKDIR}"/config.txt
210+
cp "$(get_fastboot_config_file)" "${RPI_SB_WORKDIR}"/config.txt
211211

212212
#boot.sig generation
213213
sha256sum "${RPI_SB_WORKDIR}"/boot.img | awk '{print $1}' > "${RPI_SB_WORKDIR}"/boot.sig
@@ -295,8 +295,8 @@ if [[ -z $(check_file_is_expected "${RPI_SB_WORKDIR}"/bootfs-temporary.img "img"
295295
# We supply a pre-baked Raspberry Pi Pre-boot-authentication initramfs, which we insert here.
296296
# This image is maintained by Raspberry Pi, with sources available on our GitHub pages.
297297
announce_start "Insert pre-boot authentication initramfs"
298-
cp /var/lib/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs8
299-
cp /var/lib/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs_2712
298+
cp "$(get_cryptroot)" "${TMP_DIR}"/rpi-boot-img-mount/initramfs8
299+
cp "$(get_cryptroot)" "${TMP_DIR}"/rpi-boot-img-mount/initramfs_2712
300300
announce_stop "Insert pre-boot authentication initramfs"
301301

302302
announce_start "Initramfs modification"

0 commit comments

Comments
 (0)