First try to cope with the new ability of mpd to rename its interfaces.

This is just a s/ng0/typeof connection0/ for now.

The major work should be done to allow all optX and lan to be pppoe or pptp interafaces and take just assign the network interface accordingly. It simplifies a lot o things but this has to be done.
This would propperly identifying interfaces and not hardcoding names around.

1 files changed, 7 insertions, 6 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 80a2052..c473d76 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1311,7 +1311,7 @@ function interfaces_wan_pppoe_configure() {
 	$mpdconf = <<<EOD
 startup:
 pppoeclient:
-	new -i ng0 pppoeclient pppoeclient
+	new -i pppoe0 pppoeclient pppoeclient
 	set iface route default
 	set iface {$ondemand} on-demand
 	set iface idle {$idle}
@@ -1470,7 +1470,7 @@ function interfaces_wan_pptp_configure() {
 
 	$mpdconf = <<<EOD
 pptp:
-	new -i ng0 pptp pptp
+	new -i pptp0 pptp pptp
 	set iface route default
 	set iface {$ondemand} on-demand
 	set iface idle {$idle}
@@ -1633,9 +1633,10 @@ function get_real_wan_interface() {
 	$wancfg = $config['interfaces']['wan'];
 
 	$wanif = $wancfg['if'];
-	if (($wancfg['ipaddr'] == "pppoe") || ($wancfg['ipaddr'] == "pptp")) {
-		$wanif = $g['pppoe_interface'];
-	}
+	if ($wancfg['ipaddr'] == "pppoe") 
+		$wanif = "pppoe0";
+	if ($wancfg['ipaddr'] == "pptp") 
+		$wanif = "pptp0";
 
 	return $wanif;
 }
@@ -1836,4 +1837,4 @@ function get_interface_mac($interface) {
         return $mac;
 }
 
-?>
\ No newline at end of file
+?>