From 41404ef123059fe8f073377e48f6996f7722b954 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 12 Oct 2005 19:34:40 +0000
Subject: Sync with 1.2

---
 etc/inc/interfaces.inc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'etc/inc')

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index e5f8e0d..259ec44 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -943,14 +943,20 @@ pppoe:
 	set iface {$ondemand} on-demand
 	set iface idle {$idle}
 	set iface up-script /usr/local/sbin/ppp-linkup
-
 EOD;
-
+	
 	if (isset($pppoecfg['ondemand'])) {
-		$mpdconf .= <<<EOD
-	set iface addrs 10.0.0.1 10.0.0.2
+		if (isset($pppoecfg['local-ip']) && isset($pppoecfg['remote-ip'])) {
+			$mpdconf .= <<<EOD
+	set iface addrs {$pppoecfg['local-ip']} {$pppoecfg['remote-ip']}
 
 EOD;
+		} else {
+			$mpdconf .= <<<EOD
+	set iface addrs 192.0.2.112 192.0.2.113
+
+EOD;
+		}
 	}
 
 	$mpdconf .= <<<EOD
-- 
cgit v1.1