diff options
author | Ermal <eri@pfsense.org> | 2012-04-05 21:11:44 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2012-04-05 21:11:44 +0000 |
commit | f99aa333fe20c845b256d9d243bc4c57a2bdc1d1 (patch) | |
tree | cc3b02a2b162df9c6ca0eb02abd09ac00c0d41e2 /etc | |
parent | 4459f03d4a4b7f8a5628faa91628a23135b35212 (diff) | |
download | pfsense-f99aa333fe20c845b256d9d243bc4c57a2bdc1d1.zip pfsense-f99aa333fe20c845b256d9d243bc4c57a2bdc1d1.tar.gz |
Unbreak interface.inc after manual merge
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/interfaces.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index ddd66de..f89257e 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1993,6 +1993,8 @@ function interface_carp_configure(&$vip) { file_notice("CARP", sprintf(gettext("Sorry but we could not find a matching real interface subnet for the virtual IPv6 address %s."), $vip['subnet']), "Firewall: Virtual IP", ""); return; } + } + // set the vip interface to the vhid $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; |