diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2005-09-24 20:47:31 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2005-09-24 20:47:31 +0000 |
commit | 19aeae7fb67e08140653984cd7633459af41b0e3 (patch) | |
tree | 6ca8ec2735d81628a76ef19c54e478735a5d623c /etc/inc | |
parent | 5c0a1269165388945cbd6e36a8392ca6cab78283 (diff) | |
download | pfsense-19aeae7fb67e08140653984cd7633459af41b0e3.zip pfsense-19aeae7fb67e08140653984cd7633459af41b0e3.tar.gz |
Adjust carp bootup sequence. Do not down the interfaces and later up them.
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/interfaces.inc | 17 | ||||
-rw-r--r-- | etc/inc/pfsense-utils.inc | 6 |
2 files changed, 3 insertions, 20 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 7b319e9..ca7e083 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -355,15 +355,10 @@ function interfaces_carp_configure() { } } } else { - /* hush little pfsync, don't say a word. GeekGod's gonna - buy you a mocking bird. */ + /* Hush little pfsync, don't say a word. + GeekGod's gonna buy you a mocking bird. */ mwexec("/sbin/ifconfig pfsync0 syncdev lo0 up"); - } - /* remove any dangling carp references */ - for($x=$carp_instances_counter; $x<$total_carp_interfaces_defined; $x++) { - //mwexec("/sbin/ifconfig carp{$x} down"); } - unmute_kernel_msgs(); if ($g['booting']) { unmute_kernel_msgs(); echo "done.\n"; @@ -371,13 +366,7 @@ function interfaces_carp_configure() { } function interfaces_carp_bringup() { - global $g; - /* lets bring the carp interfaces up now */ - if ($g['booting']) - sleep(2); - $carp_ints = find_number_of_created_carp_interfaces(); - for($x=0; $x<$carp_ints; $x++) - mwexec("/sbin/ifconfig carp{$x} up"); + /* no longer used */ } function interfaces_wireless_configure($if, $wlcfg) { diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index e2ce3c7..ead548b 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1147,9 +1147,6 @@ function reload_interfaces_sync() { /* set up static routes */ system_routing_configure(); - /* bring up carp interfaces */ - interfaces_carp_bringup(); - /* enable routing */ system_routing_enable(); } @@ -1258,9 +1255,6 @@ function reload_all_sync() { /* start ftp proxy helpers if they are enabled */ system_start_ftp_helpers(); - /* bring up carp interfaces */ - interfaces_carp_bringup(); - /* reload the filter */ filter_configure(); |