diff options
| author | Ermal <eri@pfsense.org> | 2014-10-15 01:39:56 +0200 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-10-15 01:39:56 +0200 |
| commit | 8ff85c397c28042b42239e7ae4c0ed2f6554ebe9 (patch) | |
| tree | 4abfa14bc1d68d61faaea02a35c70b61e1f52b80 /etc | |
| parent | 4703c007ef8b5cef28ab9650b28ea807cc7611f6 (diff) | |
| download | pfsense-8ff85c397c28042b42239e7ae4c0ed2f6554ebe9.zip pfsense-8ff85c397c28042b42239e7ae4c0ed2f6554ebe9.tar.gz | |
rename interfaces_carp_setup to interfaces_sync_setup and call it during bootup since it does not only relate to carp interfaces.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 6 | ||||
| -rw-r--r-- | etc/inc/zeromq.inc | 2 | ||||
| -rw-r--r-- | etc/phpshellsessions/enablecarp | 2 | ||||
| -rwxr-xr-x | etc/rc.bootup | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 715f144..684babd 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1942,12 +1942,12 @@ EOD; return 1; } -function interfaces_carp_setup() { +function interfaces_sync_setup() { global $g, $config; if (isset($config['system']['developerspew'])) { $mt = microtime(); - echo "interfaces_carp_setup() being called $mt\n"; + echo "interfaces_sync_setup() being called $mt\n"; } if ($g['booting']) { @@ -2129,7 +2129,7 @@ function interfaces_vips_configure($interface = "") { } } if ($carp_setuped == true) - interfaces_carp_setup(); + interfaces_sync_setup(); if ($anyproxyarp == true) interface_proxyarp_configure(); } diff --git a/etc/inc/zeromq.inc b/etc/inc/zeromq.inc index db40ce9..65589d0 100644 --- a/etc/inc/zeromq.inc +++ b/etc/inc/zeromq.inc @@ -273,7 +273,7 @@ function interfaces_carp_configure_zeromq($raw_params) { $params = $raw_params; if(zeromq_auth($raw_params) == false) return ZEROMQ_AUTH_FAIL; - interfaces_carp_setup(); + interfaces_sync_setup(); interfaces_vips_configure(); return ZEROMQ_FASLE; } diff --git a/etc/phpshellsessions/enablecarp b/etc/phpshellsessions/enablecarp index d486c04..b1c4a43 100644 --- a/etc/phpshellsessions/enablecarp +++ b/etc/phpshellsessions/enablecarp @@ -14,5 +14,5 @@ if(is_array($config['virtualip']['vip'])) { } } } -interfaces_carp_setup(); +interfaces_sync_setup(); set_single_sysctl("net.inet.carp.allow", "1"); diff --git a/etc/rc.bootup b/etc/rc.bootup index 69eb486..1b150e3 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -265,6 +265,7 @@ echo "done.\n"; if(!$debugging) mute_kernel_msgs(); interfaces_configure(); +interfaces_sync_setup(); if(!$debugging) unmute_kernel_msgs(); |
