diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-11-19 14:53:21 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-11-19 14:53:21 +0000 |
| commit | 76dec73b0b803f861192efe08b95f2cf331a96e2 (patch) | |
| tree | 6d952ddec97497237fa3b17016cb8530c60ec096 /package/base-files | |
| parent | 1b02e2c32ceefd3b59c34c3eb8d9080b83be1bd6 (diff) | |
fix ifup/down for ppp-based stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2536 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/default/etc/hotplug.d/net/10-net | 4 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifdown | 7 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifup | 7 |
3 files changed, 7 insertions, 11 deletions
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net index 29df1d2ce..3bc980f86 100644 --- a/package/base-files/default/etc/hotplug.d/net/10-net +++ b/package/base-files/default/etc/hotplug.d/net/10-net @@ -175,8 +175,8 @@ do_unregister() { case "$IFPROTO" in pppoe|pppoa|pptp) - killall ifup.${IFPROTO} - killall pppd + killall ifup.${IFPROTO} 2>&- >&- + killall pppd 2>&- >&- ;; dhcp) [ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&- diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 3ebc251f7..8818d4614 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -12,12 +12,7 @@ if=$(nvram get ${type}_ifname) case "$if_proto" in pppoa) hotplug_dev unregister atm0; exit 0 ;; - pppoe) - [ "$(nvram get pppoe_atm)" = 1 ] && { - hotplug_dev unregister atm0 - exit - } - ;; + ""|none) exit 0;; esac if [ "${if%%[0-9]}" = "br" ]; then diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index 0d75cefeb..0a2cdf533 100755 --- a/package/base-files/default/sbin/ifup +++ b/package/base-files/default/sbin/ifup @@ -14,12 +14,13 @@ if=$(nvram get ${type}_ifname) case "$if_proto" in pppoa) hotplug_dev register atm0; exit 0 ;; - pppoe) - [ "$(nvram get pppoe_atm)" = 1 ] && { + pppoe) + ifconfig nas0 2>&- >&- || { hotplug_dev register atm0 - exit + exit 0 } ;; + none|"") exit 0;; esac if [ "${if%%[0-9]}" = "br" ]; then |