summaryrefslogtreecommitdiffstats
path: root/etc/inc/system.inc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@dds.nl>2011-04-15 10:42:20 +0200
committerSeth Mos <seth.mos@dds.nl>2011-04-15 10:42:20 +0200
commitb1c305e7475f520d2a4293f04b4b451c9a926211 (patch)
tree4401ad99f9860349869996e31c7c9d698f70ff03 /etc/inc/system.inc
parentcfd404540e3e5dfa5d63001bc50c481c7d1b2112 (diff)
parentca90133bf6c497348a20eee0a706e2c4b5af9d13 (diff)
downloadpfsense-b1c305e7475f520d2a4293f04b4b451c9a926211.zip
pfsense-b1c305e7475f520d2a4293f04b4b451c9a926211.tar.gz
Merge remote branch 'upstream/master'
Diffstat (limited to 'etc/inc/system.inc')
-rw-r--r--etc/inc/system.inc3
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index e522ec1..7e55730 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -1287,9 +1287,6 @@ function system_ntp_configure() {
if(!is_dir("/var/empty"))
exec("/bin/mkdir -p /var/empty && chmod ug+rw /var/empty/.");
- if ($g['booting'])
- return;
-
/* start opentpd, set time now and use /var/etc/ntpd.conf */
exec("/usr/local/sbin/ntpd -s -f {$g['varetc_path']}/ntpd.conf");
OpenPOWER on IntegriCloud