Project

General

Profile

« Previous | Next » 

Revision cd11a142

Added by Jim Pingle over 14 years ago

Drop the ntpdate sync in favor of using ntpd -s, which should have the same net effect without needing the shell script that has been prone to hanging.

View differences:

etc/inc/system.inc
1192 1192
	if(!is_dir("/var/empty"))
1193 1193
		exec("/bin/mkdir -p /var/empty && chmod ug+rw /var/empty/.");
1194 1194

  
1195
	if ($g['booting'])
1196
		return;
1197

  
1198 1195
	/* start opentpd, set time now and use /var/etc/ntpd.conf */
1199 1196
	exec("/usr/local/sbin/ntpd -s -f {$g['varetc_path']}/ntpd.conf");
1200 1197
	
etc/rc.bootup
289 289
system_ntp_configure();
290 290
echo "done.\n";
291 291

  
292
/* Launch on bootup and keep trying to sync.  Exit once time/date has been sync'd. */
293
mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
294

  
295 292
/* start DHCP service */
296 293
services_dhcpd_configure();
297 294

  
etc/rc.newwanip
49 49
	global $oldip, $curwanipi, $g;
50 50

  
51 51
	/* restart packages */
52
	mwexec_bg("/usr/local/sbin/ntpdate_sync_once.sh");
52
	system_ntp_configure();
53 53
	log_error("{$g['product_name']} package system has detected an ip change $oldip ->  $curwanip ... Restarting packages.");		
54 54
	mwexec_bg("/etc/rc.start_packages");
55 55
}

Also available in: Unified diff