diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-08 14:16:16 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-08 14:16:16 -0400 |
| commit | 3c3cd07e9cca39f173c6d43a884c6a6e86347268 (patch) | |
| tree | 40f5a364328864aeea17c75b0dbb7898ac6bb45f /etc/inc/interfaces.inc | |
| parent | 156bf9b11947045afd85c61437f893d279dfc986 (diff) | |
| parent | 578f20ec2f8c695cfe7ac8dc67338adf07b2a4dd (diff) | |
| download | pfsense-3c3cd07e9cca39f173c6d43a884c6a6e86347268.zip pfsense-3c3cd07e9cca39f173c6d43a884c6a6e86347268.tar.gz | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 0de333b..3867c09 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -3455,9 +3455,12 @@ function link_interface_to_vips($int, $action = "") { foreach ($config['virtualip']['vip'] as $vip) { if ($int == $vip['interface']) { if ($action == "update") { - //interface_vip_bring_down($vip); - if (!does_interface_exist("vip{$vip['vhid']}")) + if ($vip['mode'] == "carp" && !does_interface_exist("vip{$vip['vhid']}")) interfaces_vips_configure($int); + else { + interface_vip_bring_down($vip); + interfaces_vips_configure($int); + } } else return $vip; } |
