From dd614142a641f243812c4d21ab75d632a8e76ca2 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 27 Mar 2022 20:31:16 -0400
Subject: [PATCH] booting not working.

---
 scripts/build_image/build_alpine.bash | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/scripts/build_image/build_alpine.bash b/scripts/build_image/build_alpine.bash
index 162750d..14de3de 100755
--- a/scripts/build_image/build_alpine.bash
+++ b/scripts/build_image/build_alpine.bash
@@ -171,14 +171,19 @@ function make_chroot {
 
     jexec "$jid" apk add --no-cache mkinitfs docker linux-virt
     jexec "$jid" apk add --no-cache --repository 'http://dl-cdn.alpinelinux.org/alpine/edge/testing' refind
-    jexec "$jid" mkinitfs -c /etc/mkinitfs/mkinitfs.conf -b / 5.15.16-0-virt
+    module_name=$(jexec "$jid" ls /lib/modules/)
+    jexec "$jid" mkinitfs -c /etc/mkinitfs/mkinitfs.conf -b / "$module_name"
     jexec "$jid" mkdir /boot/efi
     jexec "$jid" cp -r /usr/share/refind /boot/efi/boot
     jexec "$jid" cp /boot/efi/boot/refind_x64.efi /boot/efi/boot/bootx64.efi
     (umask 022 && tee "${chroot}/boot/refind_linux.conf" <<EOF
-"Boot normal"              "rw root=PARTLABEL=DIB console=ttyS0,115200"
+"Boot normal"              "rw root=vda2 console=ttyS0,115200"
 EOF
     )
+#     (umask 022 && tee "${chroot}/boot/refind_linux.conf" <<EOF
+# "Boot normal"              "rw root=PARTLABEL=DIB console=ttyS0,115200"
+# EOF
+#     )
     # Open shell to look/experiment
     # jexec "$jid" /bin/sh
 
@@ -215,7 +220,7 @@ function kill_gpg_agent {
         log "Killing gpg-agent $f"
         GNUPGHOME="$f" gpgconf --kill gpg-agent
     done
-    unset gpgagents
+    gpgagents=()
 }
 
 function stop_jails {
@@ -223,15 +228,15 @@ function stop_jails {
         log "Stopping jail $f"
         jail -r "$f"
     done
-    unset jails
+    jails=()
 }
 
 function unmount_folders {
     for (( idx=${#mountedfolders[@]}-1 ; idx>=0 ; idx-- )) ; do
         log "Unmounting folder ${mountedfolders[idx]}"
-        umount "${mountedfolders[idx]}"
+        umount -f "${mountedfolders[idx]}"
     done
-    unset mountedfolders
+    mountedfolders=()
 }
 
 function remove_memory_devices {
@@ -239,13 +244,15 @@ function remove_memory_devices {
         log "Removing memory device $f"
         mdconfig -d -u "$f"
     done
-    unset memorydevices
+    memorydevices=()
 }
 
 function main {
     precheck
 
-    work_directory=$(mktemp -d -t dib)
+    mkdir "$DIR/work_directory"
+    work_directory="$DIR/work_directory"
+    # work_directory=$(mktemp -d -t dib)
     folders+=("$work_directory")
 
     download_directory="${work_directory}/downloads"