Commit 9ee05bc3 authored by Franco Fichtner's avatar Franco Fichtner

Revert "ntp: work around recent ntpd crashes"

This reverts commit a193049d.
Was solved in FreeBSD kernel...
parent 89e80a4c
...@@ -1708,12 +1708,11 @@ function system_ntp_configure($start_ntpd = true) ...@@ -1708,12 +1708,11 @@ function system_ntp_configure($start_ntpd = true)
/* if /var/empty does not exist, create it */ /* if /var/empty does not exist, create it */
@mkdir('/var/empty', 0775, true); @mkdir('/var/empty', 0775, true);
mwexec_bg(sprintf( /* start opentpd, set time now and use new config */
/* XXX -n is --nofork due to crashing with 4.2.8p4 */ mwexecf(
'/usr/local/sbin/ntpd -n -g -c %s -p %s', '/usr/local/sbin/ntpd -g -c %s -p %s',
'/var/etc/ntpd.conf', array('/var/etc/ntpd.conf', '/var/run/ntpd.pid')
'/var/run/ntpd.pid' );
));
// Note that we are starting up // Note that we are starting up
log_error("NTPD is starting up."); log_error("NTPD is starting up.");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment