From 34c5e2fe3f42b8ccdd1918d2f077e2a9231a003f Mon Sep 17 00:00:00 2001
From: valerius <v@strategic.zone>
Date: Tue, 16 Jan 2024 15:30:31 +0100
Subject: [PATCH] update variables

---
 .../workflows/rpi-aarch64-image-builder.yml   | 12 +++++++++-
 build-archlinux-rpi-aarch64-img.sh            | 22 +------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/rpi-aarch64-image-builder.yml b/.github/workflows/rpi-aarch64-image-builder.yml
index a58cb2b..a608323 100644
--- a/.github/workflows/rpi-aarch64-image-builder.yml
+++ b/.github/workflows/rpi-aarch64-image-builder.yml
@@ -93,12 +93,22 @@ jobs:
       run: |
         sudo bsdtar -xpf $WORKDIR_BASE/ArchLinuxARM-rpi-${{ env.ARM_VERSION }}-latest.tar.gz -C $WORKDIR_BASE/root
         sudo sync
-        
+
+    - name: Check if systemd-binfmt is started
+      run: |
+        sudo systemctl start systemd-binfmt
+
+    - name: Make the new root folder a mount point
+      run: |
+        sudo mount --bind $WORKDIR_BASE/root $WORKDIR_BASE/root
+        sudo mount --bind $WORKDIR_BASE/root/boot $WORKDIR_BASE/root/boot
+
     - name: Run Build Script
       run: |
         sudo chmod +x ./build-archlinux-rpi-aarch64-img.sh
         sudo ./build-archlinux-rpi-aarch64-img.sh
 
+
     # - name: Upload Image and Get URL
     #   if: success()
     #   run: |
diff --git a/build-archlinux-rpi-aarch64-img.sh b/build-archlinux-rpi-aarch64-img.sh
index 237cf02..8f6f7a6 100755
--- a/build-archlinux-rpi-aarch64-img.sh
+++ b/build-archlinux-rpi-aarch64-img.sh
@@ -19,29 +19,9 @@ IF9fLyAKX19fXy8gXF9ffCBffCAgIFxfXyxffCBcX198IFxfX198IFxfXywgfCBffCBcX19ffCAg
 IF9fX3wgXF9fXy8gIF98ICBffCBcX19ffCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
 ICAgIHxfX18vICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK" | base64 -d
 
-# Restart teh service systemd-binfmt.service
-echo "Restarting systemd-binfmt.service..."
-systemctl restart systemd-binfmt.service
-
-# Check if the disk exists
-echo "Checking if the disk $LOOP_DEVICE exists..."
-if [ ! -b "$LOOP_DEVICE" ]; then
-  echo "The disk $LOOP_DEVICE does not exist. Exiting."
-  exit 1
-fi
 
-echo "YES! ls -l $LOOP_DEVICE"
+echo $WORKDIR_BASE
 exit 0
-
-# If the checksum is correct, proceed with extraction
-echo "Extracting root filesystem..."
-bsdtar -xpf "$WORKDIR_BASE/ArchLinuxARM-rpi-${ARM_VERSION}-latest.tar.gz" -C $WORKDIR_BASE/root
-sync
-
-# Make the new root folder a mount point
-echo "Making the new root folder a mount point..."
-mount --bind $WORKDIR_BASE/root $WORKDIR_BASE/root
-
 echo "Setting locale and keymap..."
 # Add locales to /etc/locale.gen within the chroot environment
 arch-chroot $WORKDIR_BASE/root sed -i -e '/^#en_US.UTF-8 UTF-8/s/^#//' \