diff --git a/run/network.sh b/run/network.sh index 1b03e5f..9ce94e7 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 diff --git a/run/run.sh b/run/run.sh index c669d99..325bd3b 100755 --- a/run/run.sh +++ b/run/run.sh @@ -15,8 +15,7 @@ echo "Starting QEMU 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