From 886012699aaefdd09d0709685f85333d78727d9f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Thu, 28 Dec 2023 03:46:57 +0100
Subject: [PATCH] fix: Wait on exit (#274)

* fix: Wait on exit
---
 src/network.sh |  2 +-
 src/reset.sh   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/network.sh b/src/network.sh
index 4f0af83..ae4edc7 100644
--- a/src/network.sh
+++ b/src/network.sh
@@ -174,7 +174,7 @@ closeNetwork () {
 
   else
 
-    { pkill -f dnsmasq || true; } 2>/dev/null
+    fKill "dnsmasq"
 
     ip link set "$VM_NET_TAP" down promisc off || true
     ip link delete "$VM_NET_TAP" || true
diff --git a/src/reset.sh b/src/reset.sh
index 89c45bf..df54597 100644
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -34,6 +34,18 @@ STORAGE="/storage"
 
 # Helper functions
 
+fKill () {
+  local name=$1
+
+  { pkill -f "$name" || true; } 2>/dev/null
+
+  while pgrep -f -l "$name" >/dev/null; do
+    sleep 0.1
+  done
+
+  return 0
+}
+
 addPackage () {
 
   local pkg=$1