diff options
| -rw-r--r-- | etc/inc/system.inc | 6 | ||||
| -rwxr-xr-x | usr/local/sbin/ntpdate_sync_once.sh | 4 | ||||
| -rw-r--r-- | usr/local/www/status_ntpd.php | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 741ae71..4358f5c 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/local/bin/ntpdate + pfSense_BUILDER_BINARIES: /usr/bin/tar /usr/local/sbin/ntpd /usr/local/sbin/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 @@ -1430,7 +1430,7 @@ function system_ntp_configure($start_ntpd=true) { exec("/bin/mkdir -p /var/empty && chmod ug+rw /var/empty/."); /* start opentpd, set time now and use /var/etc/ntpd.conf */ - mwexec("/usr/local/bin/ntpd -g -c {$g['varetc_path']}/ntpd.conf -p {$g['varrun_path']}/ntpd.pid", false, true); + mwexec("/usr/local/sbin/ntpd -g -c {$g['varetc_path']}/ntpd.conf -p {$g['varrun_path']}/ntpd.pid", false, true); // Note that we are starting up log_error("NTPD is starting up."); @@ -1445,7 +1445,7 @@ function sync_system_time() { /* foreach through servers and write out to ntpd.conf */ foreach (explode(' ', $config['system']['timeservers']) as $ts) { - mwexec("/usr/local/bin/ntpdate -s $ts"); + mwexec("/usr/local/sbin/ntpdate -s $ts"); } if ($g['booting']) diff --git a/usr/local/sbin/ntpdate_sync_once.sh b/usr/local/sbin/ntpdate_sync_once.sh index 4ba46aa..c183b79 100755 --- a/usr/local/sbin/ntpdate_sync_once.sh +++ b/usr/local/sbin/ntpdate_sync_once.sh @@ -23,7 +23,7 @@ while [ "$NOTSYNCED" = "true" ] && [ ${ATTEMPT} -le ${MAX_ATTEMPTS} ]; do fi done sleep 1 - /usr/local/bin/ntpdate -s -t 5 ${SERVER} + /usr/local/sbin/ntpdate -s -t 5 ${SERVER} if [ "$?" = "0" ]; then NOTSYNCED="false" else @@ -40,7 +40,7 @@ fi if [ -f /var/etc/ntpd.conf ]; then echo "Starting NTP Daemon." | /usr/bin/logger -t ntp; - /usr/local/bin/ntpd -g -c /var/etc/ntpd.conf -p /var/run/ntpd.pid + /usr/local/sbin/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 diff --git a/usr/local/www/status_ntpd.php b/usr/local/www/status_ntpd.php index 30cf18e..f7292c7 100644 --- a/usr/local/www/status_ntpd.php +++ b/usr/local/www/status_ntpd.php @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_BUILDER_BINARIES: /usr/local/bin/ntpd /usr/local/bin/ntpq + pfSense_BUILDER_BINARIES: /usr/local/sbin/ntpd /usr/local/sbin/ntpq pfSense_MODULE: ntpd */ @@ -42,7 +42,7 @@ require_once("guiconfig.inc"); -exec("/usr/local/bin/ntpq -pn | /usr/bin/tail +3", $ntpq_output); +exec("/usr/local/sbin/ntpq -pn | /usr/bin/tail +3", $ntpq_output); $ntpq_servers = array(); foreach ($ntpq_output as $line) { @@ -92,7 +92,7 @@ foreach ($ntpq_output as $line) { $ntpq_servers[] = $server; } -exec("/usr/local/bin/ntpq -c clockvar", $ntpq_clockvar_output); +exec("/usr/local/sbin/ntpq -c clockvar", $ntpq_clockvar_output); foreach ($ntpq_clockvar_output as $line) { if (substr($line, 0, 9) == "timecode=") { $tmp = explode('"', $line); |
