From 29f825af2e756c152b79a412faca2e4785e98a56 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:57:32 +0200
Subject: [PATCH 01/11] Pipefail

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

diff --git a/run/run.sh b/run/run.sh
index 777ab08..3a62b99 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 

From 9c0c41ea4173f55b90a788cbbefb2570c65f5511 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:58:50 +0200
Subject: [PATCH 02/11] Pipefail

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

diff --git a/run/install.sh b/run/install.sh
index a5d8514..6c20480 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Display wait message on port 5000
 HTML="Please wait while Virtual DSM is installing...<script>\

From 0a1026ca0d5e28b08f1717e5acb0235c06353a4c Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 18:59:25 +0200
Subject: [PATCH 03/11] Pipefail

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

diff --git a/run/disk.sh b/run/disk.sh
index c0e6fe3..6b7fd7b 100644
--- a/run/disk.sh
+++ b/run/disk.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 

From 1886ff84b967f6303c3a1ff9bec191844af27e31 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:00:10 +0200
Subject: [PATCH 04/11] Pipefail

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

diff --git a/run/network.sh b/run/network.sh
index 77856d3..5f69146 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 

From 1b309b0e6bf78f046a099f66eb061c8291273b56 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:00:36 +0200
Subject: [PATCH 05/11] Pipefail

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

diff --git a/run/power.sh b/run/power.sh
index 87fac55..ba97874 100644
--- a/run/power.sh
+++ b/run/power.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eu
+set -Eeuo pipefail
 
 # Configure QEMU for graceful shutdown
 

From 0d3b93908a9519cdb188d2fccdef105e56c0d867 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:01:08 +0200
Subject: [PATCH 06/11] Pipefail

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

diff --git a/run/serial.sh b/run/serial.sh
index c03ed61..8766875 100644
--- a/run/serial.sh
+++ b/run/serial.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eu
+set -Eeuo pipefail
 
 # Docker environment variables
 

From a16cc55ded37064060afc537fb89cb5113faa8a1 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:37:17 +0200
Subject: [PATCH 07/11] Message

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

diff --git a/run/run.sh b/run/run.sh
index 3a62b99..2d20f12 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -15,8 +15,7 @@ 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
+trap 'echo >&2 "Error status $? for: ${BASH_COMMAND} (line $LINENO/$BASH_LINENO)"' 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 96d8913e9febfa712c8f96608f00ae1e195dfd18 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:46:50 +0200
Subject: [PATCH 08/11] Options

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

diff --git a/run/run.sh b/run/run.sh
index 2d20f12..9829d44 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
-set -Eeuo pipefail
+set -Eeu
+set -o errexit
+set -o pipefail
+set -o nounset
 
 # Docker environment variables
 

From 8b42a7718ec1cdf96479780286ac53fa80789235 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:52:06 +0200
Subject: [PATCH 09/11] Pipefail

---
 run/run.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/run/run.sh b/run/run.sh
index 9829d44..2d20f12 100755
--- a/run/run.sh
+++ b/run/run.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
-set -Eeu
-set -o errexit
-set -o pipefail
-set -o nounset
+set -Eeuo pipefail
 
 # Docker environment variables
 

From a491d8643fcecc6ac631829caf7fa191f26f5568 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 19:59:54 +0200
Subject: [PATCH 10/11] Mask error

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

diff --git a/run/install.sh b/run/install.sh
index 6c20480..830680f 100644
--- a/run/install.sh
+++ b/run/install.sh
@@ -47,7 +47,7 @@ if [ "$SUM" != "14fb88cb7cabddb5af1d0269bf032845" ]; then
 fi
 
 set +e
-xz -dc <"$RD" >"$TMP/rd" 2>/dev/null
+xz -dc <"$RD" >"$TMP/rd" 2>/dev/null || true
 (cd "$TMP" && cpio -idm <"$TMP/rd" 2>/dev/null)
 set -e
 

From bcce18713528ebe7e9bba448d207715dfac63367 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Wed, 3 May 2023 20:10:03 +0200
Subject: [PATCH 11/11] Grep

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

diff --git a/run/network.sh b/run/network.sh
index 5f69146..c608315 100644
--- a/run/network.sh
+++ b/run/network.sh
@@ -155,8 +155,8 @@ configureNAT () {
     echo "/etc/resolv.conf:" && echo && cat /etc/resolv.conf && echo
   fi
 
-  mapfile -t nameservers < <(grep '^nameserver' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')
-  searchdomains=$(grep '^search' /etc/resolv.conf | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')
+  mapfile -t nameservers < <( { grep '^nameserver' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/nameserver //' | sed 's/ //g')
+  searchdomains=$( { grep '^search' /etc/resolv.conf || true; } | sed 's/\t/ /g' | sed 's/search //' | sed 's/#.*//' | sed 's/\s*$//g' | sed 's/ /,/g')
   domainname=$(echo "$searchdomains" | awk -F"," '{print $1}')
 
   for nameserver in "${nameservers[@]}"; do