Browse Source

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
Felix Fietkau 16 years ago
parent
commit
488d168c25
2 changed files with 6 additions and 5 deletions
  1. 6 0
      package/ppp/files/ppp.sh
  2. 0 5
      package/ppp/files/pppoe.sh

+ 6 - 0
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}"

+ 0 - 5
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" \