mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
make network scripts more robust, prevent multiple instances of pppd and udhcpc for the same interface
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5290 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -12,23 +12,26 @@ debug "### ifdown $cfg ###"
|
||||
config_get proto "$cfg" proto
|
||||
[ -z "$proto" ] && { echo "interface not found."; exit; }
|
||||
|
||||
# kill active ppp daemon
|
||||
pid="$(cat /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
||||
[ -n "$pid" -a -d "/proc/$pid" ] && {
|
||||
kill $pid
|
||||
sleep 1
|
||||
[ -d "/proc/$pid" ] && kill -9 $pid
|
||||
}
|
||||
|
||||
# kill any other process associated with the interface
|
||||
# kill active ppp daemon and other processes
|
||||
config_get ifname "$cfg" ifname
|
||||
pid="$(cat /var/run/${ifname}.pid 2>/dev/null)"
|
||||
[ -n "$pid" -a -d "/proc/$pid" ] && kill -9 $pid
|
||||
pids="$(cat /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid 2>/dev/null)"
|
||||
for pid in $pids; do
|
||||
[ -d "/proc/$pid" ] && {
|
||||
kill $pid
|
||||
sleep 1
|
||||
[ -d "/proc/$pid" ] && kill -9 $pid
|
||||
}
|
||||
done
|
||||
rm -f /var/run/${ifname}.pid /var/run/ppp-${cfg}.pid
|
||||
|
||||
config_get ifname "$cfg" ifname
|
||||
ifconfig "$ifname" >/dev/null 2>/dev/null && {
|
||||
ifconfig "$ifname" 0.0.0.0 down
|
||||
config_get device "$cfg" ifname
|
||||
|
||||
[ ."$device" != ."$ifname" ] || device=
|
||||
for dev in $ifname $device; do
|
||||
ifconfig "$ifname" 0.0.0.0 down >/dev/null 2>/dev/null
|
||||
done
|
||||
|
||||
config_get iftype "$cfg" type
|
||||
[ "$iftype" = "bridge" ] && brctl delbr "$ifname" >/dev/null 2>/dev/null
|
||||
|
||||
config_get iftype "$cfg" type
|
||||
[ "$iftype" = "bridge" ] && brctl delbr "$ifname"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user