diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2008-09-22 18:37:14 +0000 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2008-09-22 18:37:14 +0000 |
commit | 9ff5048ffdf1c880b8d263205c46212bb65dd420 (patch) | |
tree | abb3cd97ad16d889e9fea305f68daa82e4891e76 /etc | |
parent | 1d45c5ec308aa42875797d7d8e274e24cf0592cc (diff) | |
download | pfsense-9ff5048ffdf1c880b8d263205c46212bb65dd420.zip pfsense-9ff5048ffdf1c880b8d263205c46212bb65dd420.tar.gz |
Cleanup bootup script
Remove starting dhcp twice.
Remove double resolv.conf generation.
Remove direct pfctl filter load command.
Move initial time sync into is_wan_up logic so that it saves a lot of time on boot without a wan. opentp takes casre of it
later if required.
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.bootup | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/etc/rc.bootup b/etc/rc.bootup index b999fca..eeccf87 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -112,9 +112,6 @@ /* save dmesg output to file */ system_dmesg_save(); - /* generate resolv.conf */ - system_resolvconf_generate(); - /* set up our timezone */ system_timezone_configure(); @@ -138,9 +135,7 @@ unmute_kernel_msgs(); /* setup altq + pf */ - //mute_kernel_msgs(); filter_configure_sync(); - //unmute_kernel_msgs(); /* generate resolv.conf */ system_resolvconf_generate(); @@ -175,17 +170,14 @@ /* enable routing */ system_routing_enable(); - /* ensure passwords are sync'd */ -// system_password_configure(); - /* configure console menu */ system_console_configure(); /* check if the wan interface is up, this might delay upto 10 seconds */ - is_wan_interface_up("wan"); - - /* Sync the system time at boot before service startup */ - sync_system_time(); + if(is_wan_interface_up("wan")) { + /* Sync the system time at boot before service startup */ + sync_system_time(); + } /* start dyndns service */ services_dyndns_configure(); @@ -194,9 +186,6 @@ if (is_ipaddr($config['interfaces']['wan']['ipaddr'])) services_dnsupdate_process(); - /* start DHCP service */ - services_dhcpd_configure(); - /* start dnsmasq service */ services_dnsmasq_configure(); @@ -223,9 +212,6 @@ setup_microcode(); echo "done.\n"; - /* XXX: what is up with such hacks!? */ - mwexec("/sbin/pfctl -f /tmp/rules.debug"); - /* start IPsec tunnels */ vpn_ipsec_configure(); @@ -244,15 +230,13 @@ if(isset($config['system']['disableconsolemenu'])) touch("/var/etc/console_lockdown"); - /* XXX: something like this is done 3 times in here?!?!?!?! */ + /* Run a filter configure now that most all services have started */ filter_configure_sync(); /* load graphing functions */ enable_rrd_graphing(); - /* start DHCP service again now that CARP has settled - * incase user is using primary/backup failover dhcp mode - */ + /* start DHCP service */ services_dhcpd_configure(); /* startup OLSR if needed */ @@ -288,6 +272,7 @@ if($kern_hz == "1000") mwexec("sysctl net.inet.tcp.rexmit_min=30"); + /* start the upnp daemon if it is enabled */ upnp_start(); mwexec_bg("/usr/sbin/update_dns_cache.sh"); |