Fix ipfire ntp server defaults.
Fix symlink problem if ntp was disabled.
usr/sbin/ntptime
usr/sbin/ntptrace
usr/sbin/tickadj
+etc/rc.d/rc0.d/K46ntpd
+etc/rc.d/rc6.d/K46ntpd
+etc/rc.d/rc3.d/S26ntpd
+var/ipfire/time/counter.conf
+var/ipfire/time/enable
+var/ipfire/time/settime.conf
+var/ipfire/time/settings
srv/web/ipfire/html/images/urlfilter/copy.gif
var/ipfire/general-functions.pl
var/ipfire/extrahd/bin/extrahd.pl
+usr/local/bin/timectrl
usr/local/bin/rebuild-initrd
usr/local/bin/scanhd
usr/local/sbin/setup
--- /dev/null
+0.ipfire.pool.ntp.org 1.ipfire.pool.ntp.org
--- /dev/null
+UPDATE_VALUE=1
+ENABLENTP=on
+VALID=yes
+ENABLECLNTP=off
+ENABLESETONBOOT=on
+NTP_ADDR_2=1.ipfire.pool.ntp.org
+NTP_ADDR_1=0.ipfire.pool.ntp.org
+UPDATE_PERIOD=daily
+UPDATE_METHOD=periodically
$timesettings{'UPDATE_METHOD'} = 'manually';
$timesettings{'UPDATE_VALUE'} = '1';
$timesettings{'UPDATE_PERIOD'} = 'daily';
- $timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';
- $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
+ $timesettings{'NTP_ADDR_1'} = '0.ipfire.pool.ntp.org';
+ $timesettings{'NTP_ADDR_2'} = '1.ipfire.pool.ntp.org';
$timesettings{'ENABLESETONBOOT'} = 'off';
}
echo "server 127.127.1.0" >> /etc/ntp.conf
echo "fudge 127.127.1.0 stratum 10" >> /etc/ntp.conf
echo "driftfile /etc/ntp/drift" >> /etc/ntp.conf
+
+ #Enable it by default...
+ cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
+ chmod 644 /var/ipfire/time/*
+ chown nobody:nobody /var/ipfire/time/*
+ ln -s ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
+ ln -s ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
+ ln -s ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
safe_system("/etc/rc.d/init.d/ntp start");
} else if (strcmp(argv[1], "disable") == 0) {
safe_system("/etc/rc.d/init.d/ntpd stop");
- safe_system("rm -f /etc/rc.d/rc*.d/*ntp >/dev/null 2>&1");
+ safe_system("rm -f /etc/rc.d/rc*.d/*ntpd >/dev/null 2>&1");
} else {
fprintf(stderr, "\nBad argument given.\n\ntimectrl (start|stop|restart)\n\n");
exit(1);