aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-11-19 14:53:21 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-11-19 14:53:21 +0000
commit5f682d247464c93194f56f693b5387dbd44db5a9 (patch)
tree6d952ddec97497237fa3b17016cb8530c60ec096
parentdc2ed05154f94faa418b494143294550b92a8429 (diff)
downloadupstream-5f682d247464c93194f56f693b5387dbd44db5a9.tar.gz
upstream-5f682d247464c93194f56f693b5387dbd44db5a9.tar.bz2
upstream-5f682d247464c93194f56f693b5387dbd44db5a9.zip
fix ifup/down for ppp-based stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2536 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/default/etc/hotplug.d/net/10-net4
-rwxr-xr-xpackage/base-files/default/sbin/ifdown7
-rwxr-xr-xpackage/base-files/default/sbin/ifup7
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 29df1d2ce8..3bc980f86f 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 3ebc251f72..8818d46145 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 0d75cefeb6..0a2cdf5331 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