Add 3.20 toltec support

 * Base on mmcblk2 fix
 * Ensure home is mounted
 * Use bootstrap with updated wget

Author: timower

.github/workflows/docker-image.yml

@@ -59,7 +59,7 @@ jobs:
           - version: '3.8.2.1965'
             target: qemu-toltec
           - version: '3.20.0.92'
-            target: qemu-base
+            target: qemu-toltec
 
     steps:
       - name: Set up Docker Buildx

Dockerfile

@@ -109,10 +109,15 @@ CMD run_vm -nographic
 
 FROM qemu-base AS qemu-toltec
 
+# Install toltec:
+#  * Firsts make sure the time is synced, so https works correctly.
+#  * Next, make sure home is mounted, as xochitl does it since they introduced encrypted data.
+#  * Finally, download and run the bootstrap script.
 RUN run_vm -serial null -daemonize && \
     wait_ssh && \
     in_vm 'while ! timedatectl status | grep "synchronized: yes"; do sleep 1; done' && \
-    in_vm wget https://raw.githubusercontent.com/toltec-dev/toltec/testing/scripts/bootstrap/bootstrap && \
+    in_vm 'systemctl is-active home.mount || mount /dev/mmcblk2p4 /home' && \
+    in_vm wget https://raw.githubusercontent.com/timower/toltec/refs/heads/feat/wget-update/scripts/bootstrap/bootstrap && \
     in_vm env bash bootstrap --force && \
     save_vm
 

make_rootfs.sh

@@ -7,7 +7,7 @@ FW_VERSION=${2:-""}
 
 # Extract major.minor version for comparison
 get_version_parts() {
-    echo "$1" | cut -d '.' -f 1,2
+  echo "$1" | cut -d '.' -f 1,2
 }
 
 # Check if firmware version is >= 3.12
@@ -54,14 +54,14 @@ GFS
 
 # Handle dhcpcd.service modification for firmware versions < 3.12
 if ! should_skip_dhcpcd; then
-    echo "Modifying dhcpcd.service for firmware version $FW_VERSION"
-    guestfish --rw --add rootfs.qcow2 <<DHCPCD_GFS
+  echo "Modifying dhcpcd.service for firmware version $FW_VERSION"
+  guestfish --rw --add rootfs.qcow2 <<DHCPCD_GFS
 run
 mount /dev/sda2 /
 download /lib/systemd/system/dhcpcd.service /tmp/dhcpcd.service
 ! sed -i 's/wlan/eth/' /tmp/dhcpcd.service
 upload /tmp/dhcpcd.service /lib/systemd/system/dhcpcd.service
 DHCPCD_GFS
 else
-    echo "Skipping dhcpcd.service modification for firmware version $FW_VERSION (>= 3.12)"
+  echo "Skipping dhcpcd.service modification for firmware version $FW_VERSION (>= 3.12)"
 fi