summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-12-23 13:58:03 +0000
committerErmal <eri@pfsense.org>2010-12-23 13:58:03 +0000
commit100b72197c0bace7b2bcf5a80e14f7c3755160f0 (patch)
treecd6a3e5a1d7124732cb6043b7ea9d3c023343c5e /etc/inc
parentc513c30900f98d47dfa77dcf03d42382fae34cd7 (diff)
downloadpfsense-100b72197c0bace7b2bcf5a80e14f7c3755160f0.zip
pfsense-100b72197c0bace7b2bcf5a80e14f7c3755160f0.tar.gz
Hanlde the case when advbase is not present especially on previous 2.0 setups.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/interfaces.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 91630c5..0a5e00a 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1795,7 +1795,10 @@ function interface_carp_configure(&$vip) {
get_interface_arr(true);
$broadcast_address = gen_subnet_max($vip['subnet'], $vip['subnet_bits']);
- mwexec("/sbin/ifconfig {$vipif} {$vip['subnet']}/{$vip['subnet_bits']} vhid {$vip['vhid']} advskew {$vip['advskew']} advbase {$vip['advbase']} {$password}");
+ $advbase = "";
+ if (!empty($vip['advbase']))
+ $advbase = "advbase {$vip['advbase']}";
+ mwexec("/sbin/ifconfig {$vipif} {$vip['subnet']}/{$vip['subnet_bits']} vhid {$vip['vhid']} advskew {$vip['advskew']} {$advbase} {$password}");
interfaces_bring_up($vipif);
OpenPOWER on IntegriCloud