From 9ee05bc3e8395431a7b3b3ef602116039ffa7fe7 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 1 Nov 2015 10:41:28 +0100
Subject: [PATCH] Revert "ntp: work around recent ntpd crashes"

This reverts commit a193049d5236c5914fa8858a9f56a537996ddbaa.
Was solved in FreeBSD kernel...
---
 src/etc/inc/system.inc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index cd6945ddd..7148870e4 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -1708,12 +1708,11 @@ function system_ntp_configure($start_ntpd = true)
 	/* if /var/empty does not exist, create it */
 	@mkdir('/var/empty', 0775, true);
 
-	mwexec_bg(sprintf(
-		/* XXX -n is --nofork due to crashing with 4.2.8p4 */
-		'/usr/local/sbin/ntpd -n -g -c %s -p %s',
-		'/var/etc/ntpd.conf',
-		'/var/run/ntpd.pid'
-	));
+	/* start opentpd, set time now and use new config */
+	mwexecf(
+		'/usr/local/sbin/ntpd -g -c %s -p %s',
+		array('/var/etc/ntpd.conf', '/var/run/ntpd.pid')
+	);
 
 	// Note that we are starting up
 	log_error("NTPD is starting up.");