From 89830b60dc217b911eae70723232cb7da65e9429 Mon Sep 17 00:00:00 2001 From: Ermal Date: Fri, 30 Jul 2010 21:55:15 +0000 Subject: [PATCH] Ticket #776. reload even ipalias type of vip when reloading carps and do not destroy cloned interfaces on interface bring down. --- etc/inc/interfaces.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index be54a04d9c..90c927f0e1 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1607,16 +1607,21 @@ function interface_reload_carps($cif) { foreach ($viparr as $vip) { if (in_array($vip['carpif'], $carps)) { switch ($vip['mode']) { - case "carp": + case "carp": interface_vip_bring_down($vip); sleep(1); interface_carp_configure($vip); break; - case "carpdev-dhcp": + case "carpdev-dhcp": interface_vip_bring_down($vip); sleep(1); interface_carpdev_configure($vip); break; + case "ipalias": + interface_vip_bring_down($vip); + sleep(1); + interface_ipalias_configure($vip); + break; } } } @@ -2246,7 +2251,7 @@ function interface_configure($interface = "wan", $reloadall = false) { if (!$g['booting']) { /* remove all IPv4 addresses */ while (mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " -alias", true) == 0); - interface_bring_down($interface, true); + interface_bring_down($interface); } /* wireless configuration? */