diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-20 12:02:04 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-04-20 12:02:04 +0000 |
| commit | 8d47f51f7c0372cc7631897ee14155849b4cb886 (patch) | |
| tree | e9517a6b4b35cbe55b03dd0db929356e4b2b4b8a | |
| parent | 2a386cee9926f7350c74c6d68e798b7ff21721a9 (diff) | |
| download | upstream-8d47f51f7c0372cc7631897ee14155849b4cb886.tar.gz upstream-8d47f51f7c0372cc7631897ee14155849b4cb886.tar.bz2 upstream-8d47f51f7c0372cc7631897ee14155849b4cb886.zip | |
ppp: prevent duplicate hotplug for non uci managed ppp interfaces (#9275)
SVN-Revision: 26742
| -rw-r--r-- | package/ppp/Makefile | 4 | ||||
| -rwxr-xr-x | package/ppp/files/etc/ppp/ip-up | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 992d966497..3aefed3142 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp PKG_VERSION:=2.4.4 -PKG_RELEASE:=16 +PKG_RELEASE:=17 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ diff --git a/package/ppp/files/etc/ppp/ip-up b/package/ppp/files/etc/ppp/ip-up index 3895929539..353f667895 100755 --- a/package/ppp/files/etc/ppp/ip-up +++ b/package/ppp/files/etc/ppp/ip-up @@ -20,7 +20,14 @@ export PPP_IFACE PPP_TTY PPP_SPEED PPP_LOCAL PPP_REMOTE PPP_IPPARAM [ -n "$dns" ] && add_dns "$PPP_IPPARAM" $dns } -[ -z "$PPP_IPPARAM" ] || env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface" +[ -z "$PPP_IPPARAM" ] || { + case "$PPP_IFACE" in + # only handle uci managed interfaces here, others are done by generic hotplug + 3g-*|ppp-*|pppoa-*|pppoe-*|pptp-*) + env -i ACTION="ifup" INTERFACE="$PPP_IPPARAM" DEVICE="$PPP_IFACE" PROTO=ppp /sbin/hotplug-call "iface" + ;; + esac +} [ -d /etc/ppp/ip-up.d ] && { for SCRIPT in /etc/ppp/ip-up.d/* |