diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 8 | ||||
| -rwxr-xr-x | etc/rc.bootup | 11 | ||||
| -rwxr-xr-x | etc/rc.newwanip | 3 | ||||
| -rwxr-xr-x | etc/rc.newwanipv6 | 3 |
4 files changed, 16 insertions, 9 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index bb7ed11..b22d170 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1249,7 +1249,7 @@ function system_timezone_configure() { echo gettext("done.") . "\n"; } -function system_ntp_configure() { +function system_ntp_configure($start_ntpd=true) { global $config, $g; $driftfile = "/var/db/ntpd.drift"; @@ -1277,6 +1277,10 @@ function system_ntp_configure() { /* slurp! */ fclose($fd); + /* At bootup we just want to write out the config. */ + if (!$start_ntpd) + return; + /* if ntpd is running, kill it */ while(is_process_running("ntpd")) { killbyname("ntpd"); @@ -1294,7 +1298,7 @@ function system_ntp_configure() { // Note that we are starting up log_error("NTPD is starting up."); - + return; } function sync_system_time() { diff --git a/etc/rc.bootup b/etc/rc.bootup index baf39da..721cea6 100755 --- a/etc/rc.bootup +++ b/etc/rc.bootup @@ -305,6 +305,12 @@ system_routing_configure(); /* enable routing */ system_routing_enable(); +/* Do an initial time sync */ +echo "Starting NTP time client..."; +/* At bootup this will just write the config, ntpd will launch from ntpdate_sync_once.sh */ +system_ntp_configure(false); +mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh"); + /* start load balancer daemon */ relayd_configure(); @@ -329,11 +335,6 @@ send_event("service reload dyndnsall"); /* Run a filter configure now that most all services have started */ filter_configure_sync(); -/* start the NTP client */ -echo "Starting OpenNTP time client..."; -system_ntp_configure(); -echo "done.\n"; - /* setup pppoe and pptp */ vpn_setup(); diff --git a/etc/rc.newwanip b/etc/rc.newwanip index fd73901..a33502c 100755 --- a/etc/rc.newwanip +++ b/etc/rc.newwanip @@ -50,7 +50,8 @@ function restart_packages() { global $oldip, $curwanipi, $g; /* restart packages */ - system_ntp_configure(); + system_ntp_configure(false); + mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh"); log_error("{$g['product_name']} package system has detected an ip change $oldip -> $curwanip ... Restarting packages."); send_event("service reload packages"); } diff --git a/etc/rc.newwanipv6 b/etc/rc.newwanipv6 index 9f02772..3571e40 100755 --- a/etc/rc.newwanipv6 +++ b/etc/rc.newwanipv6 @@ -62,7 +62,8 @@ function restart_packages() { global $oldip, $curwanipv6, $g; /* restart packages */ - system_ntp_configure(); + system_ntp_configure(false); + mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh"); log_error("{$g['product_name']} package system has detected an ip change $oldip -> $curwanip ... Restarting packages."); mwexec_bg("/etc/rc.start_packages"); } |
