diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
| commit | 4816e5caa29b542c57659de8eff53ba51e355b24 (patch) | |
| tree | 7482c94367d6a7929f9e249dd71d4da5b8906953 /etc/inc/interfaces.inc | |
| parent | f5fe66cd96ed7903244b83564d4a74f16ca6369f (diff) | |
| parent | b039f099e66c9dbd0c33470bc4613e0cfdc9a1a0 (diff) | |
| download | pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.zip pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/priv.defs.inc
etc/inc/system.inc
etc/inc/upgrade_config.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index bb65766..137930e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -75,9 +75,9 @@ function does_interface_exist($interface) { global $config; if(!$interface) - return false; + return false; - $ints = get_interface_arr(); + $ints = get_interface_arr(true); if (in_array($interface, $ints)) return true; else @@ -89,7 +89,6 @@ function interfaces_loopback_configure() { echo gettext("Configuring loopback interface..."); pfSense_interface_setaddress("lo0", "127.0.0.1"); interfaces_bring_up("lo0"); - exec("/sbin/route add 127.0.0.2 127.0.0.1"); if($g['booting']) echo gettext("done.") . "\n"; return 0; |
