From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 6 Sep 2009 17:36:01 +0000 (+0000)
Subject: move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp... 
X-Git-Tag: reboot~22490
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=488d168c256a76dc96d05b93affc2a466dac99ff;p=oweals%2Fopenwrt.git

move ppp ifname fixup from pppoe.sh to ppp.sh, so that it applies to all other ppp based protocols as well

SVN-Revision: 17529
---

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index bfa708dadc..8dfdab7a0b 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -17,6 +17,12 @@ scan_ppp() {
 
 start_pppd() {
 	local cfg="$1"; shift
+	local ifname
+
+	# make sure the network state references the correct ifname
+	scan_ppp "$cfg"
+	config_get ifname "$cfg" ifname
+	set_interface_ifname "$cfg" "$ifname"
 
 	# make sure only one pppd process is started
 	lock "/var/lock/ppp-${cfg}"
diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index c0bb515162..74f1a8579c 100644
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -10,11 +10,6 @@ setup_interface_pppoe() {
 		/sbin/insmod $module 2>&- >&-
 	done
 
-	# make sure the network state references the correct ifname
-	scan_ppp "$config"
-	config_get ifname "$config" ifname
-	set_interface_ifname "$config" "$ifname"
-
 	config_get mtu "$config" mtu
 	mtu=${mtu:-1492}
 	start_pppd "$config" \