diff options
| author | jim-p <jimp@pfsense.org> | 2012-05-15 17:01:14 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-05-15 17:01:14 -0400 |
| commit | 317d1c0bb59d64690441b840f44e5dcad8ccdcca (patch) | |
| tree | 204e52deb0ed1ca9e986f421bbcfa8b1ae437ffb /etc | |
| parent | df973fcb1c7e5da87befa6a49e174dc6a6f351b5 (diff) | |
| download | pfsense-317d1c0bb59d64690441b840f44e5dcad8ccdcca.zip pfsense-317d1c0bb59d64690441b840f44e5dcad8ccdcca.tar.gz | |
Hackish workaround for ntpd failing to move away from init when called from within PHP 5.2, PHP 5.3 has a better workaround.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/system.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 22efd22..2f04d3d 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -1140,8 +1140,8 @@ function system_ntp_configure() { if(!is_dir("/var/empty")) exec("/bin/mkdir -p /var/empty && chmod ug+rw /var/empty/."); - /* start opentpd, set time now and use /var/etc/ntpd.conf */ - exec("/usr/sbin/ntpd -g -c {$g['varetc_path']}/ntpd.conf"); + /* start ntpd, allow a large initial skew, and use /var/etc/ntpd.conf - run through tcsh to work around a PHP shell exec bug. */ + exec("echo /usr/sbin/ntpd -g -c {$g['varetc_path']}/ntpd.conf | tcsh"); // Note that we are starting up log_error("NTPD is starting up."); |
