summaryrefslogtreecommitdiffstats
path: root/package/base-files/default/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'package/base-files/default/sbin')
-rwxr-xr-xpackage/base-files/default/sbin/hotplug6
-rwxr-xr-xpackage/base-files/default/sbin/ifdown28
-rwxr-xr-xpackage/base-files/default/sbin/ifup35
3 files changed, 39 insertions, 30 deletions
diff --git a/package/base-files/default/sbin/hotplug b/package/base-files/default/sbin/hotplug
index 4e009593a..e53b2afcc 100755
--- a/package/base-files/default/sbin/hotplug
+++ b/package/base-files/default/sbin/hotplug
@@ -1,7 +1,11 @@
#!/bin/sh
+[ -e /tmp/.failsafe ] && {
+ export FAILSAFE=true
+} || {
+ [ -e /etc/config/network ] && . /etc/config/network
+}
. /etc/functions.sh
. /etc/network.overrides
-[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
PATH=/bin:/sbin:/usr/bin:/usr/sbin
LOGNAME=root
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown
index f2f8bbfe8..3ebc251f7 100755
--- a/package/base-files/default/sbin/ifdown
+++ b/package/base-files/default/sbin/ifdown
@@ -1,19 +1,29 @@
#!/bin/sh
[ $# = 0 ] && { echo " $0 <group>"; exit; }
. /etc/functions.sh
-. /etc/network.overrides
+. /etc/network.overrides
[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-type=$1
debug "### ifdown $type ###"
+type=$1
+if_proto=$(nvram get ${type}_proto)
if=$(nvram get ${type}_ifname)
-proto=$(nvram get ${type}_proto)
-if_valid $if && $DEBUG ifconfig $if down
-kill $(cat /var/run/${if}.pid 2>&-) 2>&-
-killall ifup.$proto >&- 2>&-
-case "$proto" in
- pptp|pppoe) killall pppd >&- 2>&- ;;
- static) env -i ACTION="ifdown" INTERFACE="$if" PROTO=static /sbin/hotplug "iface" ;;
+
+case "$if_proto" in
+ pppoa) hotplug_dev unregister atm0; exit 0 ;;
+ pppoe)
+ [ "$(nvram get pppoe_atm)" = 1 ] && {
+ hotplug_dev unregister atm0
+ exit
+ }
+ ;;
esac
+if [ "${if%%[0-9]}" = "br" ]; then
+ for sif in $(nvram get ${type}_ifnames); do
+ hotplug_dev unregister "$sif"
+ done
+fi
+
+hotplug_dev unregister "$if"
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup
index be7075bf1..0d75cefeb 100755
--- a/package/base-files/default/sbin/ifup
+++ b/package/base-files/default/sbin/ifup
@@ -1,36 +1,31 @@
-#!/bin/ash
+#!/bin/sh
[ $# = 0 ] && { echo " $0 <group>"; exit; }
-
. /etc/functions.sh
. /etc/network.overrides
[ "$FAILSAFE" != "true" -a -e /etc/config/network ] && . /etc/config/network
-type=$1
+ifdown $1
+
debug "### ifup $type ###"
+type=$1
if_proto=$(nvram get ${type}_proto)
if=$(nvram get ${type}_ifname)
-[ "${if%%[0-9]}" = "ppp" ] && if=$(nvram get ${if_proto}_ifname)
-if_valid $if || [ "$if_proto" = "pptp" ] || exit
-mac=$(nvram get ${type}_hwaddr)
-$DEBUG ifconfig $if down 2>&-
+case "$if_proto" in
+ pppoa) hotplug_dev register atm0; exit 0 ;;
+ pppoe)
+ [ "$(nvram get pppoe_atm)" = 1 ] && {
+ hotplug_dev register atm0
+ exit
+ }
+ ;;
+esac
if [ "${if%%[0-9]}" = "br" ]; then
- stp=$(nvram get ${type}_stp)
- $DEBUG brctl delbr $if 2>&-
- $DEBUG brctl addbr $if
- $DEBUG brctl setfd $if 0
- $DEBUG brctl stp $if ${stp:-0}
-
for sif in $(nvram get ${type}_ifnames); do
- if_valid $sif || continue
- ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
- $DEBUG ifconfig $sif 0.0.0.0 up
- $DEBUG brctl addif $if $sif
+ hotplug_dev register "$sif"
done
else
- ${mac:+$DEBUG ifconfig $if down hw ether $mac}
+ hotplug_dev register "$if"
fi
-
-do_ifup $if_proto $type