From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 7 Jan 2016 23:47:39 +0000 (+0000)
Subject: timectrl: Stop ntp daemon when disabled
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16260e2c695021795a06941781f9ef86af6305ec;p=people%2Fms%2Fipfire-2.x.git

timectrl: Stop ntp daemon when disabled

Fixes #11000

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

diff --git a/config/rootfiles/core/97/filelists/files b/config/rootfiles/core/97/filelists/files
index 22fc4f0245..af53bb3121 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 48b0978d78..109d267a4f 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");