This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via 3118e3a24e710d9fa111092b2ea7d5801557c915 (commit) via cdefc58fc1586ccb493574d14c9ac48896f546bd (commit) from e515c0b965acd78429cdcb6bac9e26ecdb6c6e51 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 3118e3a24e710d9fa111092b2ea7d5801557c915 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 16:30:11 2010 +0100

ntp: new enabled at default Fix ipfire ntp server defaults. Fix symlink problem if ntp was disabled.

commit cdefc58fc1586ccb493574d14c9ac48896f546bd Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Dec 2 12:01:50 2010 +0100

Fix initscript rootfile (/etc/init.d).

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/initscripts | 1 + config/rootfiles/common/ntp | 7 +++++++ config/rootfiles/core/43/filelists/files | 1 + config/time/counter.conf | 1 + .../backup/hosts/.placeholder => time/enable} | 0 config/time/settime.conf | 1 + config/{cfgroot/time-settings => time/settings} | 12 +++++++----- html/cgi-bin/time.cgi | 4 ++-- lfs/ntp | 9 +++++++++ src/misc-progs/timectrl.c | 2 +- 10 files changed, 30 insertions(+), 8 deletions(-) create mode 100644 config/time/counter.conf copy config/{nagiosql/etc/nagiosql/backup/hosts/.placeholder => time/enable} (100%) create mode 100644 config/time/settime.conf copy config/{cfgroot/time-settings => time/settings} (59%)

Difference in files: diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 8370f3f..90ecf19 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -216,3 +216,4 @@ etc/sysconfig/firewall.local etc/sysconfig/modules etc/sysconfig/rc etc/sysconfig/rc.local +etc/init.d diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp index 82892c7..5f21e83 100644 --- a/config/rootfiles/common/ntp +++ b/config/rootfiles/common/ntp @@ -16,3 +16,10 @@ usr/sbin/ntpq 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 diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files index 5bc2127..c492f47 100644 --- a/config/rootfiles/core/43/filelists/files +++ b/config/rootfiles/core/43/filelists/files @@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/vpnmain.cgi 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 diff --git a/config/time/counter.conf b/config/time/counter.conf new file mode 100644 index 0000000..c77754a --- /dev/null +++ b/config/time/counter.conf @@ -0,0 +1 @@ +1435 diff --git a/config/time/enable b/config/time/enable new file mode 100644 index 0000000..e69de29 diff --git a/config/time/settime.conf b/config/time/settime.conf new file mode 100644 index 0000000..9effa58 --- /dev/null +++ b/config/time/settime.conf @@ -0,0 +1 @@ +0.ipfire.pool.ntp.org 1.ipfire.pool.ntp.org diff --git a/config/time/settings b/config/time/settings new file mode 100644 index 0000000..f60ff45 --- /dev/null +++ b/config/time/settings @@ -0,0 +1,9 @@ +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 diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi index c68eb99..caa1718 100644 --- a/html/cgi-bin/time.cgi +++ b/html/cgi-bin/time.cgi @@ -174,8 +174,8 @@ if ($timesettings{'VALID'} eq '') $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'; }

diff --git a/lfs/ntp b/lfs/ntp index 9bfe9d0..1859212 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -81,5 +81,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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) diff --git a/src/misc-progs/timectrl.c b/src/misc-progs/timectrl.c index f09e641..48b0978 100644 --- a/src/misc-progs/timectrl.c +++ b/src/misc-progs/timectrl.c @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) { 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);

hooks/post-receive -- IPFire 2.x development tree