diff --git a/board/common/overlay/etc/init.d/S40network b/board/common/overlay/etc/init.d/S40network
index 9bf07f4359..b19a0df636 100755
--- a/board/common/overlay/etc/init.d/S40network
+++ b/board/common/overlay/etc/init.d/S40network
@@ -182,9 +182,8 @@ start() {
     fi
     
     if [ "$eth_ok" != "ok" ] && [ "$wlan_ok" != "ok" ] && [ "$ppp_ok" != "ok" ]; then
-        logger -t ethernet -s "no network connection available"        
-        reboot
-        return 1
+        logger -t ethernet -s "no network connection available"
+        test "$watch_link" == "yes" && return 1 || return 0
     fi
 
     if [ -n "$static_gw" ]; then
diff --git a/board/common/overlay/etc/init.d/S99showinfo b/board/common/overlay/etc/init.d/S99showinfo
index 98da17c4e4..33642c072d 100755
--- a/board/common/overlay/etc/init.d/S99showinfo
+++ b/board/common/overlay/etc/init.d/S99showinfo
@@ -17,8 +17,9 @@ show_gateway() {
 }
 
 show_dns() {
-    dns=$(cat /etc/resolv.conf | grep nameserver | cut -d ' ' -f 2)
-    test -n "$gateway" && msg_info "DNS server address is $dns"
+    test -r /etc/resolv.conf || return
+    dns=$(cat /etc/resolv.conf | grep nameserver | head -n 1 | cut -d ' ' -f 2)
+    test -n "$dns" && msg_info "DNS server address is $dns"
 }
 
 case "$1" in