From 9b696e38ce9e01cc132c84d779f8a79f71a54e7b Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:00:40 +0200
Subject: [PATCH 1/4] fix: Use pidwait on recent kernels

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

diff --git a/run/run.sh b/run/run.sh
index 9f293ec..6303747 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -81,7 +81,7 @@ set -m
 )
 set +m
 
-if (( KERNEL > 5 )) || ( (( KERNEL == 5 )) && (( MINOR > 2 )) ); then
+if (( KERNEL > 5 )) || ( (( KERNEL == 5 )) && (( MINOR > 10 )) ); then
   pidwait -F "${_QEMU_PID}" & wait $!
 else
   tail --pid "$(cat "${_QEMU_PID}")" --follow /dev/null & wait $!

From 03d333e29991c4608f1b7c0b453cc132e073a9a2 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:04:17 +0200
Subject: [PATCH 2/4] fix: Delete network on shutdown

---
 run/network.sh | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/run/network.sh b/run/network.sh
index aa11881..e0ffaae 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -31,7 +31,10 @@ configureDHCP() {
     error "and that the NET_ADMIN capability has been added to the container config: --cap-add NET_ADMIN" && exit 16
   fi
 
-  ip link set "${VM_NET_TAP}" up
+  while ! ip link set "${VM_NET_TAP}" up; do
+    info "Waiting for address to become available..."
+    sleep 2
+  done
 
   TAP_NR=$(</sys/class/net/"${VM_NET_TAP}"/ifindex)
   TAP_PATH="/dev/tap${TAP_NR}"
@@ -127,11 +130,20 @@ configureNAT () {
   fi
 
   ip address add ${VM_NET_IP%.*}.1/24 broadcast ${VM_NET_IP%.*}.255 dev dockerbridge
-  ip link set dockerbridge up
+
+  while ! ip link set dockerbridge up; do
+    info "Waiting for address to become available..."
+    sleep 2
+  done
 
   # QEMU Works with taps, set tap to the bridge created
   ip tuntap add dev "${VM_NET_TAP}" mode tap
-  ip link set "${VM_NET_TAP}" up promisc on
+
+  while ! ip link set "${VM_NET_TAP}" up promisc on; do
+    info "Waiting for tap to become available..."
+    sleep 2
+  done
+
   ip link set dev "${VM_NET_TAP}" master dockerbridge
 
   # Add internet connection to the VM
@@ -165,6 +177,24 @@ configureNAT () {
   return 0
 }
 
+closeNetwork () {
+
+  if [[ "${DHCP}" == [Yy1]* ]]; then
+
+    ip link set "${VM_NET_TAP}" down || true
+    ip link delete "${VM_NET_TAP}" || true
+
+  else
+
+    ip link set "${VM_NET_TAP}" down promisc off || true
+    ip link delete "${VM_NET_TAP}" || true
+
+    ip link set dockerbridge down || true
+    ip link delete dockerbridge || true
+
+  fi
+}
+
 # ######################################
 #  Configure Network
 # ######################################

From 0a2a17724bcca2798eccdec9b32623991c500954 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:06:04 +0200
Subject: [PATCH 3/4] fix: Delete network on shutdown

---
 run/power.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/run/power.sh b/run/power.sh
index bbb16cf..4e4f95f 100644
--- a/run/power.sh
+++ b/run/power.sh
@@ -50,6 +50,8 @@ _graceful_shutdown() {
   echo && echo "❯ Quitting..."
   echo 'quit' | nc -q 1 -w 1 localhost "${QEMU_MONPORT}" >/dev/null 2>&1 || true
 
+  closeNetwork
+
   return
 }
 

From 511125169a038784354c9052bee041f5cfd772b6 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 5 Jul 2023 13:08:51 +0200
Subject: [PATCH 4/4] style: Remove spaces

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

diff --git a/run/disk.sh b/run/disk.sh
index 6d5ef85..ef6d59e 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -34,7 +34,7 @@ if [ -f "${DATA}" ]; then
 
       REQ=$((DATA_SIZE-OLD_SIZE))
 
-      # Check free diskspace    
+      # Check free diskspace
       SPACE=$(df --output=avail -B 1 "${STORAGE}" | tail -n 1)
 
       if (( REQ > SPACE )); then