diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-16 03:14:59 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-16 03:14:59 +0000 |
| commit | 23e86550c9c59436cc5f253292774861dd6ca62e (patch) | |
| tree | a0c0305aa47833b2dfce82ccb24bde0d0b637548 /package | |
| parent | 9b74fa0d6c5baa266b095aaa8b0dc63735b91cd3 (diff) | |
port wan_device changes from whiterussian to kamikaze
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2993 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/default/etc/hotplug.d/net/10-net | 2 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifdown | 2 | ||||
| -rwxr-xr-x | package/base-files/default/sbin/ifup | 2 | ||||
| -rw-r--r-- | package/ppp/files/ifup.pppoe | 2 | ||||
| -rw-r--r-- | package/pptp/files/ifup.pptp | 2 |
5 files changed, 5 insertions, 5 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 8d2c6a803..dd4ee8863 100644 --- a/package/base-files/default/etc/hotplug.d/net/10-net +++ b/package/base-files/default/etc/hotplug.d/net/10-net @@ -26,7 +26,7 @@ find_name() } ;; *) - [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \ + [ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \ -a -x /sbin/ifup.${IFPROTO} ] && return 0 ;; esac diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/default/sbin/ifdown index 85bb2fbc5..d0120dcbe 100755 --- a/package/base-files/default/sbin/ifdown +++ b/package/base-files/default/sbin/ifdown @@ -15,7 +15,7 @@ case "$if_proto" in ""|none) exit 0;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)" +[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" if [ "${if%%[0-9]}" = "br" ]; then for sif in $(nvram get ${type}_ifnames); do diff --git a/package/base-files/default/sbin/ifup b/package/base-files/default/sbin/ifup index 67e01a3e9..8ae641668 100755 --- a/package/base-files/default/sbin/ifup +++ b/package/base-files/default/sbin/ifup @@ -23,7 +23,7 @@ case "$if_proto" in none|"") exit 0;; esac -[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${if_proto}_ifname)" +[ "${if%%[0-9]*}" = "ppp" ] && if="$(nvram get ${type}_device)" if [ "${if%%[0-9]}" = "br" ]; then for sif in $(nvram get ${type}_ifnames); do diff --git a/package/ppp/files/ifup.pppoe b/package/ppp/files/ifup.pppoe index a038b3427..b43d2689b 100644 --- a/package/ppp/files/ifup.pppoe +++ b/package/ppp/files/ifup.pppoe @@ -14,7 +14,7 @@ for module in slhc ppp_generic pppox pppoe; do /sbin/insmod $module 2>&- >&- done -IFNAME=$(nvram get pppoe_ifname) +IFNAME=$(nvram get ${type}_device) USERNAME=$(nvram get ppp_username) PASSWORD=$(nvram get ppp_passwd) KEEPALIVE=$(nvram get ppp_redialperiod) diff --git a/package/pptp/files/ifup.pptp b/package/pptp/files/ifup.pptp index c8a1a5eee..fe04d9784 100644 --- a/package/pptp/files/ifup.pptp +++ b/package/pptp/files/ifup.pptp @@ -33,7 +33,7 @@ do_ifup $PPTP_PROTO $type # hack for some buggy ISPs NETMASK=$(nvram get ${type}_netmask) -IFNAME=$(nvram get pptp_ifname) +IFNAME=$(nvram get ${type}_device) [ -z "$NETMASK" -o -z "$IFNAME" ] || ifconfig $IFNAME netmask $NETMASK /usr/sbin/pppd \ |