diff options
| author | Renato Botelho <renato@netgate.com> | 2016-04-04 17:40:11 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-04-04 17:40:11 -0300 |
| commit | 5a758355ec9a20ff75c9191b6915df64255fb8be (patch) | |
| tree | 5249a1d9269008c8f434eb1919beca0f9699f9dc /src/etc | |
| parent | 67c934440521e8081d90850f4a10a40e82603db3 (diff) | |
| download | pfsense-5a758355ec9a20ff75c9191b6915df64255fb8be.zip pfsense-5a758355ec9a20ff75c9191b6915df64255fb8be.tar.gz | |
Ticket #6053
- Do not call ntpdate before start ntpd, ntpd -g parameter is enough
- Deprecate /usr/local/sbin/ntpdate_sync_once.sh
- Remove system_ntp_configure parameter and always start ntpd
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/system.inc | 7 | ||||
| -rw-r--r-- | src/etc/pfSense.obsoletedfiles | 1 | ||||
| -rwxr-xr-x | src/etc/rc.bootup | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index c44dfab..dc8f902 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -1572,7 +1572,7 @@ function system_ntp_setup_pps($serialport) { } -function system_ntp_configure($start_ntpd=true) { +function system_ntp_configure() { global $config, $g; $driftfile = "/var/db/ntpd.drift"; @@ -1868,11 +1868,6 @@ function system_ntp_configure($start_ntpd=true) { return; } - /* At bootup we just want to write out the config. */ - if (!$start_ntpd) { - return; - } - /* if ntpd is running, kill it */ while (isvalidpid("{$g['varrun_path']}/ntpd.pid")) { killbypid("{$g['varrun_path']}/ntpd.pid"); diff --git a/src/etc/pfSense.obsoletedfiles b/src/etc/pfSense.obsoletedfiles index 655ea6f..16854e5 100644 --- a/src/etc/pfSense.obsoletedfiles +++ b/src/etc/pfSense.obsoletedfiles @@ -642,6 +642,7 @@ /usr/local/sbin/mdnsd /usr/local/sbin/mini_httpd /usr/local/sbin/mpd +/usr/local/sbin/ntpdate_sync_once.sh /usr/local/sbin/olsrd /usr/local/sbin/pbi /usr/local/sbin/pbi-crashhandler diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup index 2a32a07..5c8b613 100755 --- a/src/etc/rc.bootup +++ b/src/etc/rc.bootup @@ -308,11 +308,9 @@ services_dnsmasq_configure(); /* start unbound service */ services_unbound_configure(); -/* Do an initial time sync */ +/* Enable ntpd */ 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", true); +system_ntp_configure(); echo "done.\n"; /* start load balancer daemon */ |
