From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 9 Feb 2018 11:03:07 +0000 (+0100)
Subject: systemd: remove kresd.service meta-service
X-Git-Tag: v2.1.0~1^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f9aa9a6237ec9945cae79a62c3b7a24f606c526;p=thirdparty%2Fknot-resolver.git

systemd: remove kresd.service meta-service

The kresd.service meta-service could be confusing for users and provides
no extra functionality. The system-kresd.slice can be used to restart or
stop all running instances.

Distributions shipping with /etc/init.d/kresd should symlink the
kresd.service to /dev/null to prevent systemd-sysv-generator from
creating this service.
---

diff --git a/doc/kresd.systemd.7 b/doc/kresd.systemd.7
index d231c32ca..541ea4ddb 100644
--- a/doc/kresd.systemd.7
+++ b/doc/kresd.systemd.7
@@ -18,7 +18,6 @@ kresd.socket
 kresd-tls.socket
 kresd-control@.socket
 system-kresd.slice
-kresd.service
 .fi
 
 .SH "DESCRIPTION"
@@ -36,10 +35,8 @@ single, independent kresd process.
 The systemd-managed \fBkresd\fR service set is grouped in the
 \fIsystem-kresd.slice\fR slice.  The slice includes one or more
 running daemons (instances of \fIkresd@.service\fR), public listening
-sockets (the same listening sockets are shared by all daemons), a
-dedicated control socket for each running daemon, and one meta-service
-(\fIkresd.service\fR) which can be used to stop or restart all the
-daemons.
+sockets (the same listening sockets are shared by all daemons) and a
+dedicated control socket for each running daemon.
 
 Each instance of \fIkresd@.service\fR has three systemd sockets (see
 \fBsystemd.socket(5)\fR) associated with it:
diff --git a/systemd/kresd.service b/systemd/kresd.service
deleted file mode 100644
index 75cf4dfdb..000000000
--- a/systemd/kresd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Knot DNS Resolver daemon (meta-service, see "systemctl status 'kresd@*.service'")
-Documentation=man:kresd(8)
-Documentation=man:kresd.systemd(7)
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/true
-ExecReload=/bin/true
-Slice=system-kresd.slice
-
-[Install]
-WantedBy=multi-user.target
diff --git a/systemd/kresd@.service b/systemd/kresd@.service
index 3995490a4..acfa80bd6 100644
--- a/systemd/kresd@.service
+++ b/systemd/kresd@.service
@@ -1,7 +1,6 @@
 [Unit]
 Description=Knot DNS Resolver daemon
 Documentation=man:kresd(8)
-PartOf=kresd.service
 
 [Service]
 Type=notify