Packaging: Move static components to /var/lib

Author: tdewey-rpi

device-provisioner/provisioner.sh

@@ -12,9 +12,10 @@ COPY_OS_COMBINED_FILE=""
 DEBUG=
 TARGET_DEVICE_SERIAL="$1"
 
-. /etc/rpi-sb-provisioner/config
 . /usr/local/bin/terminal-functions.sh
 
+read_config
+
 check_pidevice_storage_type() {
     case "${1}" in
         "sd")
@@ -204,9 +205,9 @@ case ${RPI_DEVICE_FAMILY} in
         ;;
 esac
 
-cp /usr/share/rpi-sb-provisioner/fastboot-gadget.img "${RPI_SB_WORKDIR}"/boot.img
+cp /var/lib/rpi-sb-provisioner/fastboot-gadget.img "${RPI_SB_WORKDIR}"/boot.img
 
-cp /usr/share/rpi-sb-provisioner/boot_ramdisk_config.txt "${RPI_SB_WORKDIR}"/config.txt
+cp /var/lib/rpi-sb-provisioner/boot_ramdisk_config.txt "${RPI_SB_WORKDIR}"/config.txt
 
 #boot.sig generation
 sha256sum "${RPI_SB_WORKDIR}"/boot.img | awk '{print $1}' > "${RPI_SB_WORKDIR}"/boot.sig
@@ -294,8 +295,8 @@ if [[ -z $(check_file_is_expected "${RPI_SB_WORKDIR}"/bootfs-temporary.img "img"
     # We supply a pre-baked Raspberry Pi Pre-boot-authentication initramfs, which we insert here.
     # This image is maintained by Raspberry Pi, with sources available on our GitHub pages.
     announce_start "Insert pre-boot authentication initramfs"
-    cp /usr/share/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs8
-    cp /usr/share/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs_2712
+    cp /var/lib/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs8
+    cp /var/lib/rpi-sb-provisioner/cryptroot_initramfs "${TMP_DIR}"/rpi-boot-img-mount/initramfs_2712
     announce_stop "Insert pre-boot authentication initramfs"
 
     announce_start "Initramfs modification"

device-triage/triage.sh

@@ -2,9 +2,10 @@
 
 set -e
 
-. /etc/rpi-sb-provisioner/config
 . /usr/local/bin/terminal-functions.sh
 
+read_config
+
 TARGET_DEVICE_SERIAL="$(udevadm info --name="$1" --query=property --property=ID_SERIAL_SHORT --value)"
 echo "Starting triage for $1, serial: $TARGET_DEVICE_SERIAL"
 
@@ -17,7 +18,7 @@ if [ ! -d "${DEVICE_SERIAL_STORE}" ]; then
 fi
 
 if [ -z "${RPI_DEVICE_BOOTLOADER_CONFIG_FILE}" ]; then
-    RPI_DEVICE_BOOTLOADER_CONFIG_FILE=/etc/default/rpi-sb-provisioner/bootloader.default
+    RPI_DEVICE_BOOTLOADER_CONFIG_FILE=/var/lib/rpi-sb-provisioner/bootloader.default
 fi
 
 if [ -z "${CUSTOMER_KEY_FILE_PEM}" ]; then

host-support/config

@@ -2,7 +2,7 @@ CUSTOMER_KEY_FILE_PEM=
 GOLD_MASTER_OS_FILE=
 RPI_DEVICE_STORAGE_TYPE=
 RPI_DEVICE_FAMILY=
-RPI_DEVICE_BOOTLOADER_CONFIG_FILE=/usr/share/rpi-sb-provisioner/bootloader.config
+RPI_DEVICE_BOOTLOADER_CONFIG_FILE=/var/lib/rpi-sb-provisioner/bootloader.config
 RPI_DEVICE_LOCK_JTAG=
 RPI_DEVICE_EEPROM_WP_SET=
 DEVICE_SERIAL_STORE=/usr/local/etc/rpi-sb-provisioner/seen

host-support/terminal-functions.sh

@@ -97,4 +97,37 @@ check_pidevice_generation() {
             exit 1
             ;;
     esac
+}
+
+read_config() {
+    if [ -f /etc/rpi-sb-provisioner/config ]; then
+        . /etc/rpi-sb-provisioner/config
+    else
+        echo "Failed to load config. Please use configuration tool." >&2
+        exit 1
+    fi
+}
+
+get_cryptroot() {
+    if [ -f /etc/rpi-sb-provisioner/cryptroot_initramfs ]; then
+        echo "/etc/rpi-sb-provisioner/cryptroot_initramfs"
+    else
+        echo "/var/lib/rpi-sb-provisioner/cryptroot_initramfs"
+    fi
+}
+
+get_fastboot_gadget() {
+    if [ -f /etc/rpi-sb-provisioner/fastboot-gadget.img ]; then
+        echo "/etc/rpi-sb-provisioner/fastboot-gadget.img"
+    else
+        echo "/var/lib/rpi-sb-provisioner/fastboot-gadget.img"
+    fi
+}
+
+get_fastboot_config_file() {
+    if [ -f /etc/rpi-sb-provisioner/boot_ramdisk_config.txt ]; then
+        echo "/etc/rpi-sb-provisioner/boot_ramdisk_config.txt"
+    else
+        echo "/var/lib/rpi-sb-provisioner/boot_ramdisk_config.txt"
+    fi
 }

key-writer/keywriter.sh

@@ -2,9 +2,10 @@
 
 set -x
 
-. /etc/rpi-sb-provisioner/config
 . /usr/local/bin/terminal-functions.sh
 
+read_config
+
 TARGET_DEVICE_SERIAL="$1"
 
 die() {

nfpm.yaml

@@ -190,16 +190,16 @@ contents:
     dst: /usr/local/bin/terminal-functions.sh
 
   - src: host-support/cryptroot_initramfs
-    dst: /usr/share/rpi-sb-provisioner/cryptroot_initramfs
+    dst: /var/lib/rpi-sb-provisioner/cryptroot_initramfs
 
   - src: host-support/boot_ramdisk_config.txt
-    dst: /usr/share/rpi-sb-provisioner/boot_ramdisk_config.txt
+    dst: /var/lib/rpi-sb-provisioner/boot_ramdisk_config.txt
 
   - src: host-support/bootloader.config.default
-    dst: /usr/share/rpi-sb-provisioner/bootloader.config
+    dst: /var/lib/rpi-sb-provisioner/bootloader.config
 
   - src: host-support/fastboot-gadget.img
-    dst: /usr/share/rpi-sb-provisioner/fastboot-gadget.img
+    dst: /var/lib/rpi-sb-provisioner/fastboot-gadget.img
 
   - src: host-support/make-boot-image
     dst: /usr/local/bin/make-boot-image