From 5f9c2e9fa6bb077f115b2c3e1d5db6b79dbfc625 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 25 Feb 2007 13:45:45 +0000
Subject: more reliable fix for handling ppp

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6356 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/base-files/files/etc/hotplug.d/net/10-net | 5 +++++
 package/ppp/files/ppp.sh                          | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'package')

diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 9b72338ce..77eb6da9d 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -3,6 +3,11 @@
 include /lib/network
 
 addif() {
+	# PPP devices are configured by pppd, no need to run setup_interface here
+	case "$INTERFACE" in
+		ppp*) return 0;;
+	esac
+
 	scan_interfaces
 	local cfg="$(find_config "$INTERFACE")"
 
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 5eb007da1..0bd75fc0a 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -3,10 +3,6 @@ scan_ppp() {
 	pppdev="${pppdev:-0}"
 	config_set "$1" ifname "ppp$pppdev"
 	config_set "$1" unit "$pppdev"
-	
-	# set 'auto' to 0, so that hotplug does not attempt to
-	# reconfigure an interface that is managed by pppd
-	config_set "$1" auto 0
 }
 
 start_pppd() {
-- 
cgit v1.2.3