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, next has been updated via 16260e2c695021795a06941781f9ef86af6305ec (commit) from 764a3f1ff2384f34c592c311f5435a24eb6a53c8 (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 16260e2c695021795a06941781f9ef86af6305ec Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jan 7 23:47:39 2016 +0000

timectrl: Stop ntp daemon when disabled

Fixes #11000

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/core/97/filelists/files | 1 + src/misc-progs/timectrl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core/97/filelists/files index 22fc4f0..af53bb3 100644 --- a/config/rootfiles/core/97/filelists/files +++ b/config/rootfiles/core/97/filelists/files @@ -4,3 +4,4 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/qos.cgi usr/bin/pgrep usr/local/bin/qosctrl +usr/local/bin/timectrl diff --git a/src/misc-progs/timectrl.c b/src/misc-progs/timectrl.c index 48b0978..109d267 100644 --- a/src/misc-progs/timectrl.c +++ b/src/misc-progs/timectrl.c @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) { safe_system("ln -fs ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd >/dev/null 2>&1"); 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("/etc/rc.d/init.d/ntp stop"); 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");

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