From e60cf73a9f2b8dbfb568870bb50bbbc92b9fd711 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:39:02 +0100
Subject: [PATCH 1/5] feat: Configure sizes for multiple disks

---
 run/disk.sh | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/run/disk.sh b/run/disk.sh
index 33db148..32cb1cd 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -128,34 +128,60 @@ DISK_OPTS="\
     -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=${DISK_ROTATION},bootindex=1"
 
+: ${DISK2_SIZE:=''}
+EXTRA_SIZE=DISK2_SIZE
 EXTRA_DISK="/storage2/data.img"
 
-if [ -f "${EXTRA_DISK}" ]; then
+if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
 
+  if [ ! -f "${EXTRA_DISK}" ]; then
+    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
+    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
+      error "Could not create the file for the second disk." && exit 53
+    fi
+  fi
+
+  if [ -n "$EXTRA_SIZE" ]; then
+    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
+    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
+    fi
+  fi
+  
   DISK_OPTS="${DISK_OPTS} \
     -device virtio-scsi-pci,id=hw-userdata2,bus=pcie.0,addr=0xd \
     -drive file=${EXTRA_DISK},if=none,id=drive-userdata2,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata2.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata2,id=userdata2,rotation_rate=${DISK_ROTATION},bootindex=4"
 
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 53
-
 fi
 
+: ${DISK3_SIZE:=''}
+EXTRA_SIZE=DISK3_SIZE
 EXTRA_DISK="/storage3/data.img"
 
-if [ -f "${EXTRA_DISK}" ]; then
+if [ -d "$(dirname "${EXTRA_DISK}")" ]; then
+
+  if [ ! -f "${EXTRA_DISK}" ]; then
+    [ -z "$EXTRA_SIZE" ] && EXTRA_SIZE="16G"
+    if ! truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"; then
+      error "Could not create the file for the third disk." && exit 54
+    fi
+  fi
+
+  if [ -n "$EXTRA_SIZE" ]; then
+    CUR_SIZE=$(stat -c%s "${EXTRA_DISK}")
+    DATA_SIZE=$(numfmt --from=iec "${EXTRA_SIZE}")
+    if [ "$DATA_SIZE" -gt "$CUR_SIZE" ]; then
+      truncate -s "${EXTRA_SIZE}" "${EXTRA_DISK}"
+    fi
+  fi
 
   DISK_OPTS="${DISK_OPTS} \
     -device virtio-scsi-pci,id=hw-userdata3,bus=pcie.0,addr=0xe \
     -drive file=${EXTRA_DISK},if=none,id=drive-userdata3,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata3.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata3,id=userdata3,rotation_rate=${DISK_ROTATION},bootindex=5"
 
-else
-
-  [ -d "$(dirname "${EXTRA_DISK}")" ] && error "Disk image ${EXTRA_DISK} does not exist! Please supply an empty file of at least 6 GB." && exit 54
-
 fi
 
 : ${DEVICE:=''}        # Docker variable to passthrough a block device, like /dev/vdc1.

From 9cef9c9c3b345dc2676aa6da9c6cb6913c20f38d Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:43:31 +0100
Subject: [PATCH 2/5] feat: Skip gateway check in debugmode

---
 run/network.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/run/network.sh b/run/network.sh
index 6a45de8..d9af662 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -232,7 +232,11 @@ fi
 if [[ "${DHCP}" == [Yy1]* ]]; then
 
   if [[ "$GATEWAY" == "172."* ]]; then
-    error "You can only enable DHCP while the container is on a macvlan network!" && exit 86
+    if [[ "${DEBUG}" == [Yy1]* ]]; then
+      info "Warning: Are you sure the container is on a macvlan network?"
+    else
+      error "You can only enable DHCP while the container is on a macvlan network!" && exit 86
+    fi
   fi
 
   # Configuration for DHCP IP

From f93203be0764b23aa2873ac4babad9d52bca557a Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:53:29 +0100
Subject: [PATCH 3/5] feat: Make bootdisk optional

---
 run/disk.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/run/disk.sh b/run/disk.sh
index 32cb1cd..2b53b23 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -9,8 +9,6 @@ set -Eeuo pipefail
 : ${DISK_ROTATION:='1'}   # Rotation rate, set to 1 for SSD storage and increase for HDD
 
 BOOT="$STORAGE/boot.img"
-[ ! -f "$BOOT" ] && echo "ERROR: Boot image does not exist ($BOOT)" && exit 81
-
 DATA="${STORAGE}/data.img"
 DISK_SIZE=$(echo "${DISK_SIZE}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 DATA_SIZE=$(numfmt --from=iec "${DISK_SIZE}")
@@ -120,10 +118,16 @@ if [[ SIZE -ne DATA_SIZE ]]; then
   error "Virtual disk has the wrong size: ${SIZE}" && exit 89
 fi
 
-DISK_OPTS="\
+DISK_OPTS=""
+
+if [ -f "$BOOT" ]; then
+  DISK_OPTS="${DISK_OPTS} \
     -drive id=cdrom0,if=none,format=raw,readonly=on,file=${BOOT} \
     -device virtio-scsi-pci,id=scsi0 \
-    -device scsi-cd,bus=scsi0.0,drive=cdrom0,bootindex=9 \
+    -device scsi-cd,bus=scsi0.0,drive=cdrom0,bootindex=9"
+fi
+
+DISK_OPTS="${DISK_OPTS} \
     -device virtio-scsi-pci,id=hw-userdata,bus=pcie.0,addr=0xa \
     -drive file=${DATA},if=none,id=drive-userdata,format=raw,cache=${DISK_CACHE},aio=${DISK_IO},discard=${DISK_DISCARD},detect-zeroes=on \
     -device scsi-hd,bus=hw-userdata.0,channel=0,scsi-id=0,lun=0,drive=drive-userdata,id=userdata0,rotation_rate=${DISK_ROTATION},bootindex=1"

From 0dad8ba8301aeaac871e5b0011a55a7f17d8f6d9 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 11 Nov 2023 17:56:21 +0100
Subject: [PATCH 4/5] feat: Make bootdisk optional

---
 run/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/run.sh b/run/run.sh
index 704492d..67bacdb 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -28,7 +28,7 @@ VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
 
 [ ! -d "$STORAGE" ] && error "Storage folder (${STORAGE}) not found!" && exit 13
 
-if [ ! -f "$STORAGE/boot.img" ]; then
+if [ ! -f "$STORAGE/data.img" ]; then
   . /run/install.sh
 fi
 

From fac628f0d859945870d04817d9a04f04560b4faa Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 11 Nov 2023 18:11:14 +0100
Subject: [PATCH 5/5] feat: Make bootdisk optional

---
 run/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run/run.sh b/run/run.sh
index 67bacdb..704492d 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -28,7 +28,7 @@ VERS=$(qemu-system-x86_64 --version | head -n 1 | cut -d '(' -f 1)
 
 [ ! -d "$STORAGE" ] && error "Storage folder (${STORAGE}) not found!" && exit 13
 
-if [ ! -f "$STORAGE/data.img" ]; then
+if [ ! -f "$STORAGE/boot.img" ]; then
   . /run/install.sh
 fi