diff --git a/src/network.sh b/src/network.sh index 2b47da9..81af5e2 100644 --- a/src/network.sh +++ b/src/network.sh @@ -173,8 +173,11 @@ configureDNS() { if ! $DNSMASQ ${arguments:+ $arguments}; then local msg="Failed to start Dnsmasq, reason: $?" - [ -f "$log" ] && cat "$log" - error "$msg" + + if [[ "${NETWORK,,}" == "slirp" || "${NETWORK,,}" == "passt" || "$ROOTLESS" != [Yy1]* || "$DEBUG" == [Yy1]* ]]; then + [ -f "$log" ] && [ -s "$log" ] && cat "$log" + error "$msg" + fi return 1 fi @@ -420,7 +423,7 @@ configurePasst() { { $PASST ${PASST_OPTS:+ $PASST_OPTS}; rc=$?; } || : if (( rc != 0 )); then - [ -f "$log" ] && cat "$log" + [ -f "$log" ] && [ -s "$log" ] && cat "$log" warn "failed to start passt ($rc), falling back to slirp networking!" configureSlirp && return 0 || return 1 fi @@ -431,7 +434,7 @@ configurePasst() { tail -fn +0 "$log" --pid=$$ & else if [[ "$DEBUG" == [Yy1]* ]]; then - [ -f "$log" ] && cat "$log" && echo "" + [ -f "$log" ] && [ -s "$log" ] && cat "$log" && echo "" fi fi @@ -838,7 +841,7 @@ else case "${NETWORK,,}" in "passt" | "slirp" | "user"* ) ;; - "tap" | "tun" | "tuntap" | "y" ) + "tap" | "tun" | "tuntap" | "y" | "" ) # Configure tap interface if ! configureNAT; then @@ -857,7 +860,7 @@ else esac case "${NETWORK,,}" in - "tap" | "tun" | "tuntap" | "y" ) ;; + "tap" | "tun" | "tuntap" | "y" | "" ) ;; "passt" | "user"* ) # Configure for user-mode networking (passt)