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 | 92feed28d882bf9dc75f59e2ed183e84362935d9 (patch) | |
| tree | c77b7134f8224f6de1935e268f475ed05719e895 | |
| parent | 43580f1b1ddc263f4f218c08f56df6ca1fa74afb (diff) | |
| download | upstream-92feed28d882bf9dc75f59e2ed183e84362935d9.tar.gz upstream-92feed28d882bf9dc75f59e2ed183e84362935d9.tar.bz2 upstream-92feed28d882bf9dc75f59e2ed183e84362935d9.zip | |
more reliable fix for handling ppp
SVN-Revision: 6356
| -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() { |