swconfig: fix vlan/port configs being applied to all switches

[openwrt.git] / package / base-files / files / etc / functions.sh

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index d5ffc13..e4b3bad 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -275,4 +275,46 @@ uci_apply_defaults() {
        uci commit
 }
 
        uci commit
 }
 

+service_kill() {
+       local name="${1}"
+       local pid="${2:-$(pidof "$name")}"
+       local grace="${3:-5}"
+
+       [ -f "$pid" ] && pid="$(head -n1 "$pid" 2>/dev/null)"
+
+       for pid in $pid; do
+               [ -d "/proc/$pid" ] || continue
+               local try=0
+               kill -TERM $pid 2>/dev/null && \
+                       while grep -qs "$name" "/proc/$pid/cmdline" && [ $((try++)) -lt $grace ]; do sleep 1; done
+               kill -KILL $pid 2>/dev/null && \
+                       while grep -qs "$name" "/proc/$pid/cmdline"; do sleep 1; done
+       done
+}
+
+
+pi_include() {
+       if [ -f "/tmp/overlay/$1" ]; then
+               . "/tmp/overlay/$1"
+       elif [ -f "$1" ]; then
+               . "$1"
+       elif [ -d "/tmp/overlay/$1" ]; then
+               if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then
+                       for src_script in /tmp/overlay/$1/*.sh; do
+                               . "$src_script"
+                       done
+               fi
+       elif [ -d "$1" ]; then
+               if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then
+                       for src_script in $1/*.sh; do
+                               . "$src_script"
+                       done
+               fi
+       else
+               echo "WARNING: $1 not found"
+               return 1
+       fi
+       return 0
+}
+

 [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
 [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh