diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-11-11 19:05:55 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-11-11 19:05:55 +0000 |
| commit | 94b636a61883a508ec2415bb31ecc141ad8a1d76 (patch) | |
| tree | 1a1a35242d25e915db7240809b995578611fd076 /etc | |
| parent | fb76d927aae91a4b35d146c6006df23820c02433 (diff) | |
| download | pfsense-94b636a61883a508ec2415bb31ecc141ad8a1d76.zip pfsense-94b636a61883a508ec2415bb31ecc141ad8a1d76.tar.gz | |
MFC 7507
* Don't forget to ++ the counter
* Usleep before bringing up the interface
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e1551d6..b121ab2 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -408,8 +408,8 @@ function interfaces_carp_configure() { echo "Configuring carp{$carp_instances_counter}.\n"; fwrite($fd, "/sbin/ifconfig carp" . $carp_instances_counter . " " . $vip['subnet'] . "/" . $vip['subnet_bits'] . " broadcast " . $broadcast_address . " vhid " . $vip['vhid'] . "{$carpdev} advskew 200 " . $password . "\n"); mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " " . $vip['subnet'] . "/" . $vip['subnet_bits'] . " broadcast " . $broadcast_address . " vhid " . $vip['vhid'] . "{$carpdev} advskew 200 " . $password); - if($g['booting']) - mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " up"); + usleep(10); + mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " up"); $carp_instances_counter++; } } @@ -439,6 +439,7 @@ function interfaces_carp_bring_up_final() { $supress = intval(`/sbin/sysctl net.inet.carp.suppress_preempt | cut -d" " -f2`); if($counter > 15) $supress = 0; + $counter++; } sleep(45); foreach ($viparr as $vip) { @@ -1433,4 +1434,4 @@ function discover_bridge($interface1, $interface2) { return "-1"; } -?>
\ No newline at end of file +?> |
