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, 5 deletions

diff --git a/etc/rc.bootup b/etc/rc.bootup
index c1749cf..7930da6 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -278,6 +278,12 @@ system_routing_configure();
 /* enable routing */
 system_routing_enable();
 
+/* Do an initial time sync */
+echo "Starting NTP time client...";
+/* At bootup this will just write the config, ntpd will launch from ntpdate_sync_once.sh */
+system_ntp_configure(false);
+mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
+
 /* start load balancer daemon */
 relayd_configure();
 
@@ -302,11 +308,6 @@ send_event("service reload dyndnsall");
 /* Run a filter configure now that most all services have started */
 filter_configure_sync();
 
-/* start the NTP client */
-echo "Starting OpenNTP time client...";
-system_ntp_configure();
-echo "done.\n";
-
 /* setup pppoe and pptp */
 vpn_setup();