From: Michael Chapman <mike@very.puzzling.org>
Date: Mon, 9 Dec 2013 06:23:25 +0000 (+1100)
Subject: virtlockd: improve systemd units
X-Git-Tag: CVE-2013-6436~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1163fa36b72de14838816daf3c983a1931f1a8cb;p=thirdparty%2Flibvirt.git

virtlockd: improve systemd units

- Pass VIRTLOCKD_ARGS through to virtlockd.

- Use SIGUSR1, not SIGHUP, in ExecReload. At present, virtlockd only
  responds to the former.

- Have "systemctl enable virtlockd.service" enable virtlockd.socket,
  rather than throw an error.

- Make virtlockd.socket wanted by sockets.target, rather than
  multi-user.target. This is consistent with other socket units in
  Fedora, and it ensures that the socket is available before libvirtd is
  started.

Signed-off-by: Michael Chapman <mike@very.puzzling.org>
---

diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
index 0ef9923233..a1298a3451 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -4,9 +4,12 @@ Requires=virtlockd.socket
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/virtlockd
-ExecStart=@sbindir@/virtlockd
-ExecReload=/bin/kill -HUP $MAINPID
+ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
+ExecReload=/bin/kill -USR1 $MAINPID
 # Loosing the locks is a really bad thing that will
 # cause the machine to be fenced (rebooted), so make
 # sure we discourage OOM killer
 OOMScoreAdjust=-900
+
+[Install]
+Also=virtlockd.socket
diff --git a/src/locking/virtlockd.socket.in b/src/locking/virtlockd.socket.in
index a38b1f4d94..9808bbb1be 100644
--- a/src/locking/virtlockd.socket.in
+++ b/src/locking/virtlockd.socket.in
@@ -5,4 +5,4 @@ Description=Virtual machine lock manager socket
 ListenStream=@localstatedir@/run/libvirt/virtlockd-sock
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=sockets.target