From d392a12c11cefa6ab0fbe774a89058e5c1a14f49 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 17:43:00 +0200
Subject: [PATCH 1/9] Clear exitcode

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

diff --git a/run/network.sh b/run/network.sh
index 2f75188..39d1444 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -247,4 +247,4 @@ fi
 
 [ "$DEBUG" = "Y" ] && echo && echo "Finished network setup.." && echo
 
-exit 0
+return

From 77de3a9f2576761e9fbf146f2f349d3626bf3291 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 17:43:32 +0200
Subject: [PATCH 2/9] Clear exitcode

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

diff --git a/run/install.sh b/run/install.sh
index 3f0cf90..4647278 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -213,4 +213,4 @@ rm -rf "$TMP"
 { set +x; } 2>/dev/null
 [ "$DEBUG" = "Y" ] && echo
 
-exit 0
+return

From d7c0b0c2d127fafeb836c7826a10b522b38ecc6f Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:01:35 +0200
Subject: [PATCH 3/9] Trap errors

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

diff --git a/run/run.sh b/run/run.sh
index 7efac0f..6644f0f 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -15,6 +15,9 @@ echo "Starting Virtual DSM for Docker v${VERSION}..."
 STORAGE="/storage"
 KERNEL=$(uname -r | cut -b 1)
 
+trap 'echo >&2 "Error - exited with status $? at line $LINENO:"; 
+         pr -tn $0 | tail -n+$((LINENO - 3)) | head -n7 >&2' ERR
+
 [ ! -d "$STORAGE" ] && echo "Storage folder (${STORAGE}) not found!" && exit 69
 [ ! -f "/run/run.sh" ] && echo "Script must run inside Docker container!" && exit 60
 

From a29c7116bde44ba7bb9154e306f30134ecca4860 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:02:08 +0200
Subject: [PATCH 4/9] Error handling

---
 run/network.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/run/network.sh b/run/network.sh
index 39d1444..7916975 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -246,5 +246,3 @@ if [ "$DHCP" = "Y" ]; then
 fi
 
 [ "$DEBUG" = "Y" ] && echo && echo "Finished network setup.." && echo
-
-return

From bab71142448c76d4408396784a18b39e5e955c93 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:02:37 +0200
Subject: [PATCH 5/9] Error handling

---
 run/install.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/run/install.sh b/run/install.sh
index 4647278..31a9218 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -212,5 +212,3 @@ rm -rf "$TMP"
 
 { set +x; } 2>/dev/null
 [ "$DEBUG" = "Y" ] && echo
-
-return

From d52412ee1e196ea1e58c8646c808e5d42364fe95 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:06:01 +0200
Subject: [PATCH 6/9] Return zero

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

diff --git a/run/install.sh b/run/install.sh
index 31a9218..a5d8514 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -212,3 +212,5 @@ rm -rf "$TMP"
 
 { set +x; } 2>/dev/null
 [ "$DEBUG" = "Y" ] && echo
+
+return 0

From 39b6e413d733b53c7657f095a9005e02f141d50e Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:06:23 +0200
Subject: [PATCH 7/9] Update network.sh

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

diff --git a/run/network.sh b/run/network.sh
index 7916975..77856d3 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -246,3 +246,5 @@ if [ "$DHCP" = "Y" ]; then
 fi
 
 [ "$DEBUG" = "Y" ] && echo && echo "Finished network setup.." && echo
+
+return 0

From 003ad0c42ffd2739e784300db382f465e7a67d36 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:08:43 +0200
Subject: [PATCH 8/9] Disable trap

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

diff --git a/run/run.sh b/run/run.sh
index 6644f0f..6a62f8c 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -83,6 +83,8 @@ set -m
 )
 set +m
 
+trap - ERR
+
 if (( KERNEL > 4 )); then
   pidwait -F "${_QEMU_PID}" & wait $!
 else

From 577fd0143176acc6b8e32d6e5b1dd9fb5d9003b1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:12:11 +0200
Subject: [PATCH 9/9] Disable trap

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

diff --git a/run/run.sh b/run/run.sh
index 6a62f8c..777ab08 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -75,6 +75,8 @@ EXTRA_OPTS="$EXTRA_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,ad
 ARGS="${DEF_OPTS} ${CPU_OPTS} ${RAM_OPTS} ${MAC_OPTS} ${MON_OPTS} ${SERIAL_OPTS} ${NET_OPTS} ${DISK_OPTS} ${EXTRA_OPTS}"
 ARGS=$(echo "$ARGS" | sed 's/\t/ /g' | tr -s ' ')
 
+trap - ERR
+
 set -m
 (
   [ "$DEBUG" = "Y" ] && set -x
@@ -83,8 +85,6 @@ set -m
 )
 set +m
 
-trap - ERR
-
 if (( KERNEL > 4 )); then
   pidwait -F "${_QEMU_PID}" & wait $!
 else