From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 19 Nov 2005 14:53:21 +0000 (+0000)
Subject: fix ifup/down for ppp-based stuff
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=969a4d1c2a55b9def4c4576816ffe37f357e0f94;p=openwrt%2Fstaging%2Frmilecki.git

fix ifup/down for ppp-based stuff

SVN-Revision: 2536
---

diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index 29df1d2ce83..3bc980f86f0 100644
--- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/openwrt/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/openwrt/package/base-files/default/sbin/ifdown b/openwrt/package/base-files/default/sbin/ifdown
index 3ebc251f720..8818d46145c 100755
--- a/openwrt/package/base-files/default/sbin/ifdown
+++ b/openwrt/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/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index 0d75cefeb6c..0a2cdf5331c 100755
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/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