diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 13:45:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-02-25 13:45:45 +0000 |
| commit | b66907b65d6be323b815bab03e32b2af64f3e2b0 (patch) | |
| tree | c1b516342537403fd24e25da08a09702565388c9 | |
| parent | 30c55d788e295359cb7f16c19906b82b12504704 (diff) | |
| download | upstream-b66907b65d6be323b815bab03e32b2af64f3e2b0.tar.gz upstream-b66907b65d6be323b815bab03e32b2af64f3e2b0.tar.bz2 upstream-b66907b65d6be323b815bab03e32b2af64f3e2b0.zip | |
more reliable fix for handling ppp
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6356 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/files/etc/hotplug.d/net/10-net | 5 | ||||
| -rw-r--r-- | package/ppp/files/ppp.sh | 4 |
2 files changed, 5 insertions, 4 deletions
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 9b72338ce8..77eb6da9d4 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 5eb007da1f..0bd75fc0a7 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() { |