On its own, ntpd does not sync fast enough at bootup, so bring back the ntpdate sync but improve it so it can't get stuck forever.

Conflicts:

	etc/rc.newwanipv6

1 files changed, 6 insertions, 2 deletions

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 2f04d3d..e343a17 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -1106,7 +1106,7 @@ function system_timezone_configure() {
 		echo "done.\n";
 }
 
-function system_ntp_configure() {
+function system_ntp_configure($start_ntpd=true) {
 	global $config, $g;
 	$driftfile = "/var/db/ntpd.drift";
 
@@ -1131,6 +1131,10 @@ function system_ntp_configure() {
 	/* slurp! */
 	fclose($fd);
 
+	/* At bootup we just want to write out the config. */
+	if (!$start_ntpd)
+		return;
+
 	/* if ntpd is running, kill it */
 	while(is_process_running("ntpd")) {
 		killbyname("ntpd");
@@ -1145,7 +1149,7 @@ function system_ntp_configure() {
 	
 	// Note that we are starting up
 	log_error("NTPD is starting up.");
-
+	return;
 }
 
 function sync_system_time() {