Merge remote-tracking branch 'upstream/dev' into dev

2017-03-21 20:14:31 +01:00 · 2017-03-21 20:14:31 +01:00 · 400661d432
parent e4e60ed654 0a5eaec0f2
commit 400661d432
1 changed files with 5 additions and 1 deletions
--- a/acme.sh
+++ b/acme.sh
@ -1131,8 +1131,12 @@ _ss() {
      elif netstat -help 2>&1 | grep -- '-P protocol' >/dev/null; then
        #for solaris
        netstat -an -P tcp | grep "\.$_port " | grep "LISTEN"
-      else
+      elif netstat -help 2>&1 | grep "\-p" >/dev/null; then
+        #for full linux
        netstat -ntpl | grep ":$_port "
+      else
+        #for busybox (embedded linux; no pid support)
+        netstat -ntl 2>/dev/null | grep ":$_port "
      fi
    fi
    return 0