Stop mounting partition 1 as /boot (#120)

Raspberry Pi OS's prior to Bookworm would mount partition 1 as /boot.
This is the default behavior for the arm-runner-action that we were
using to create images and this behavior was copied in the
photon-image-runner that we now use. However, mounting this partition as
/boot shadows the real /boot and prevents modifying the contents of that
directory. This turns up as a problem when we try to modify the
dtoverlay.

On Raspberry Pi images from Bookworm, partition 1 is mounted as
/boot/firmware. On the Orange Pi images we use, partition 1 is a data
folder for cloud-init and should be mounted at /CIDATA.

This PR overrides the automatic mounting of partition 1 and instead
leaves it to the appropriate install script to mount any partitions
other than root as appropriate for that image.

Author: crschardt

.github/workflows/main.yml

@@ -98,12 +98,13 @@ jobs:
         minimum_free_mb: 2000
         image_url: ${{ matrix.base_image }}
         root_location: ${{ matrix.root_location || 'partition=2' }}
+        boot_partition:
         shrink_image: ${{ matrix.shrink_image || 'yes' }}
         commands: |
             set -e
             echo "Running ${{ matrix.script }}"
             chmod +x "${{ matrix.script }}"
-            "./${{ matrix.script }}"
+            "./${{ matrix.script }}" "Dev"
             echo "Running install_common.sh"
             chmod +x "./install_common.sh"
             "./install_common.sh"

install_dev_pi.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -15,8 +20,8 @@ chmod +x ./install.sh
 ./install.sh --install-nm=yes --arch=aarch64
 
 # and edit boot partition
-install -m 644 config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 config.txt /boot/firmware
+install -m 644 userconf.txt /boot/firmware
 
 # configure hostname
 echo "photonvision" > /etc/hostname
@@ -46,3 +51,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware

install_limelight.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -15,11 +20,11 @@ chmod +x ./install.sh
 ./install.sh --install-nm=yes --arch=aarch64 --version="$1"
 
 # edit boot partition
-install -m 644 limelight/config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 limelight/config.txt /boot/firmware/
+install -m 644 userconf.txt /boot/firmware/
 
 # install LL DTS
-dtc -O dtb limelight/gloworm-dt.dts -o /boot/dt-blob.bin
+dtc -O dtb limelight/gloworm-dt.dts -o /boot/firmware/dt-blob.bin
 
 # Kill wifi and other networking things
 install -v -m 644 -D -t /etc/systemd/system/dhcpcd.service.d/ files/wait.conf
@@ -45,3 +50,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware

install_limelight3.sh

@@ -5,7 +5,14 @@ set -ex +u
 
 # Run the pi install script
 chmod +x ./install_pi.sh
-./install_pi.sh
+./install_pi.sh "$1"
+
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
 
 # Add the one extra file for the LL3
-wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/dt-blob.bin
+wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/firmware/dt-blob.bin
+
+umount /boot/firmware

install_limelight3g.sh

@@ -5,10 +5,17 @@ set -ex +u
 
 # Run the pi install script
 chmod +x ./install_pi.sh
-./install_pi.sh
+./install_pi.sh "$1"
+
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
 
 # Install our new config.txt with OV9281 overlay
-install -m 644 limelight3g/config.txt /boot/
+install -m 644 limelight3g/config.txt /boot/firmware
 
 # Add the one extra file for the LL3
-wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/dt-blob.bin
+wget https://datasheets.raspberrypi.org/cmio/dt-blob-cam1.bin -O /boot/firmware/dt-blob.bin
+
+umount /boot/firmware

install_limelight4.sh

@@ -5,7 +5,14 @@ set -ex +u
 
 # Run the pi install script
 chmod +x ./install_pi.sh
-./install_pi.sh
+./install_pi.sh "$1"
+
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
 
 # Install our new config.txt with OV9281 overlay
-install -m 644 limelight4/config.txt /boot/
+install -m 644 limelight4/config.txt /boot/firmware
+
+umount /boot/firmware

install_luma_p1.sh

@@ -5,11 +5,18 @@ set -ex +u
 
 # Run the pi install script
 chmod +x ./install_pi.sh
-./install_pi.sh
+./install_pi.sh "$1"
+
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
 
 # Install our new config.txt with OV9281 overlay
-install -m 644 luma_p1/config.txt /boot/
+install -m 644 luma_p1/config.txt /boot/firmware
 
 # Add the database file for the p1 hardware config and default pipeline
 mkdir -p /opt/photonvision/photonvision_config
 install -v -m 644 luma_p1/photon.sqlite /opt/photonvision/photonvision_config/photon.sqlite
+
+umount /boot/firmware

install_opi5.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /CIDATA
+mkdir --parent /CIDATA
+mount "${loopdev}p1" /CIDATA
+ls -la /CIDATA
+
 # Create pi/raspberry login
 if id "pi" >/dev/null 2>&1; then
     echo 'user found'
@@ -62,9 +67,9 @@ apt-get --yes -qq install libc6 libstdc++6
 rm -f /etc/netplan/00-default-nm-renderer.yaml
 
 # set NetworkManager as the renderer in cloud-init
-cp -f ./OPi5_CIDATA/network-config /boot/network-config
+cp -f ./OPi5_CIDATA/network-config /CIDATA/network-config
 # add customized user-data file for cloud-init
-cp -f ./OPi5_CIDATA/user-data /boot/user-data
+cp -f ./OPi5_CIDATA/user-data /CIDATA/user-data
 
 # modify photonvision.service to enable big cores
 sed -i 's/# AllowedCPUs=4-7/AllowedCPUs=4-7/g' /lib/systemd/system/photonvision.service
@@ -96,3 +101,5 @@ apt-get --yes -qq clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /CIDATA

install_pi.sh

@@ -3,6 +3,11 @@
 # Exit on errors, print commands, ignore unset variables
 set -ex +u
 
+# mount partition 1 as /boot/firmware
+mkdir --parent /boot/firmware
+mount "${loopdev}p1" /boot/firmware
+ls -la /boot/firmware
+
 # silence log spam from dpkg
 cat > /etc/apt/apt.conf.d/99dpkg.conf << EOF
 Dpkg::Progress-Fancy "0";
@@ -12,11 +17,11 @@ EOF
 
 # Run normal photon installer
 chmod +x ./install.sh
-./install.sh -v "$1" --install-nm=yes --arch=aarch64 --version="$1"
+./install.sh --install-nm=yes --arch=aarch64 --version="$1"
 
 # and edit boot partition
-install -m 644 config.txt /boot/
-install -m 644 userconf.txt /boot/
+install -m 644 config.txt /boot/firmware
+install -m 644 userconf.txt /boot/firmware
 
 # configure hostname
 echo "photonvision" > /etc/hostname
@@ -46,3 +51,5 @@ apt-get clean
 
 rm -rf /usr/share/doc
 rm -rf /usr/share/locale/
+
+umount /boot/firmware

install_snakeyes.sh

@@ -5,7 +5,7 @@ set -ex +u
 
 # Run the pi install script
 chmod +x ./install_pi.sh
-./install_pi.sh
+./install_pi.sh "$1"
 
 # Add the one extra file for the snakeyes hardware config
 mkdir -p /opt/photonvision/photonvision_config