diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 19:34:40 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-12 19:34:40 +0000 |
| commit | 41404ef123059fe8f073377e48f6996f7722b954 (patch) | |
| tree | 57eb0f26506590f0ece55298825f3e6faf73eb2a /etc/inc | |
| parent | 3f5b6d4a59456e6022556f41ca5faa3a31678f20 (diff) | |
| download | pfsense-41404ef123059fe8f073377e48f6996f7722b954.zip pfsense-41404ef123059fe8f073377e48f6996f7722b954.tar.gz | |
Sync with 1.2
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 14 |
1 files changed, 10 insertions, 4 deletions
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 |
