diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2013-08-16 16:54:45 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2013-08-16 16:55:17 -0300 |
| commit | 6d501aefc2598af0a48c00c5b9f85bd6d72803ce (patch) | |
| tree | b09ab20202a820bbb5d8a39c4c6b8aaf947747de | |
| parent | 17921b7e8dd8e1113a391ed5f570d31ab8c88154 (diff) | |
| download | pfsense-6d501aefc2598af0a48c00c5b9f85bd6d72803ce.zip pfsense-6d501aefc2598af0a48c00c5b9f85bd6d72803ce.tar.gz | |
Use ntpdate from ports also and obsolete base one
| -rw-r--r-- | etc/inc/system.inc | 4 | ||||
| -rw-r--r-- | etc/pfSense.obsoletedfiles | 1 | ||||
| -rwxr-xr-x | usr/local/sbin/ntpdate_sync_once.sh | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index d6d6615..848cefb 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -33,7 +33,7 @@ pfSense_BUILDER_BINARIES: /usr/sbin/powerd /usr/bin/killall /sbin/sysctl /sbin/route pfSense_BUILDER_BINARIES: /bin/hostname /bin/ls /usr/sbin/syslogd pfSense_BUILDER_BINARIES: /usr/sbin/pccardd /usr/local/sbin/lighttpd /bin/chmod /bin/mkdir - pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/local/bin/ntpd /usr/sbin/ntpdate + pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/local/bin/ntpd /usr/local/bin/ntpdate pfSense_BUILDER_BINARIES: /usr/bin/nohup /sbin/dmesg /usr/local/sbin/atareinit /sbin/kldload pfSense_BUILDER_BINARIES: /usr/local/sbin/filterdns pfSense_MODULE: utils @@ -1405,7 +1405,7 @@ function sync_system_time() { /* foreach through servers and write out to ntpd.conf */ foreach (explode(' ', $config['system']['timeservers']) as $ts) { - mwexec("/usr/sbin/ntpdate -s $ts"); + mwexec("/usr/local/bin/ntpdate -s $ts"); } if ($g['booting']) diff --git a/etc/pfSense.obsoletedfiles b/etc/pfSense.obsoletedfiles index 25267cd..8ad0758 100644 --- a/etc/pfSense.obsoletedfiles +++ b/etc/pfSense.obsoletedfiles @@ -56,3 +56,4 @@ /usr/local/www/progress.php /usr/local/www/upload_progress.php /usr/sbin/ntpd +/usr/sbin/ntpdate diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh index 3809b23..ebe33b5 100755 --- a/usr/local/sbin/ntpdate_sync_once.sh +++ b/usr/local/sbin/ntpdate_sync_once.sh @@ -12,7 +12,7 @@ while [ "$NOTSYNCED" = "true" ] && [ ${ATTEMPT} -le ${MAX_ATTEMPTS} ]; do /usr/bin/killall ntpd 2>/dev/null /usr/bin/killall ntpdate 2>/dev/null sleep 1 - /usr/sbin/ntpdate -s -t 5 ${SERVER} + /usr/local/bin/ntpdate -s -t 5 ${SERVER} if [ "$?" = "0" ]; then NOTSYNCED="false" else @@ -32,4 +32,4 @@ if [ -f /var/etc/ntpd.conf ]; then /usr/local/bin/ntpd -g -c /var/etc/ntpd.conf -p /var/run/ntpd.pid else echo "NTP configuration file missing, not starting daemon." | /usr/bin/logger -t ntp; -fi
\ No newline at end of file +fi |
