daemon: use socket activation with systemd

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/.gitignore b/.gitignore
index 90fee91cc4fd585c4f9c7b2f9998f5b3d21151d2..9776ea14573284d4e07b2aa0270fbe819c60f6d6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,7 @@
 /daemon/libvirtd.pod
 /daemon/libvirtd.policy
 /daemon/libvirtd.service
+/daemon/libvirtd.socket
 /daemon/test_libvirtd.aug
 /docs/aclperms.htmlinc
 /docs/apibuild.py.stamp

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 00221ab5f523c22339a9492788cf6deddfa237c3..70b765585f0a70b0b4d8a42c8faff1e7146b71f5 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -55,6 +55,7 @@ EXTRA_DIST =                                          \
        libvirtd.policy.in                              \
        libvirtd.sasl                                   \
        libvirtd.service.in                             \
+       libvirtd.socket.in                              \
        libvirtd.sysconf                                \
        libvirtd.sysctl                                 \
        libvirtd.aug                                    \
@@ -388,15 +389,18 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART
 if LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
-BUILT_SOURCES += libvirtd.service
+BUILT_SOURCES += libvirtd.service libvirtd.socket
 
-install-init-systemd: install-sysconfig libvirtd.service
+install-init-systemd: install-sysconfig libvirtd.service libvirtd.socket
        $(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
        $(INSTALL_DATA) libvirtd.service \
          $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
+       $(INSTALL_DATA) libvirtd.socket \
+         $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket
 
 uninstall-init-systemd: uninstall-sysconfig
        rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.service
+       rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirtd.socket
        rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
 else ! LIBVIRT_INIT_SCRIPT_SYSTEMD
 install-init-systemd:
@@ -420,6 +424,12 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
            < $< > $@-t &&                                      \
            mv $@-t $@
 
+libvirtd.socket: libvirtd.socket.in $(top_builddir)/config.status
+       $(AM_V_GEN)sed                                          \
+           -e 's|[@]runstatedir[@]|$(runstatedir)|g'           \
+           < $< > $@-t &&                                      \
+           mv $@-t $@
+
 
 check-local: check-augeas
 

diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
index 2d80274edcf01e260a084faa03ed107c9455c735..d4f6a1cc2e0c991faa713377239f23d3b2eb98db 100644 (file)
--- a/daemon/libvirtd.conf
+++ b/daemon/libvirtd.conf
@@ -77,6 +77,11 @@
 # UNIX socket access controls
 #
 
+# Beware that if you are changing *any* of these options, and you use
+# socket activation with systemd, you need to adjust the settings in
+# the libvirtd.socket file as well since it could impose a security
+# risk if you rely on file permission checking only.
+
 # Set the UNIX domain socket group ownership. This can be used to
 # allow a 'trusted' set of users access to management capabilities
 # without becoming root.

diff --git a/daemon/libvirtd.service.in b/daemon/libvirtd.service.in
index 086da367af7fa0a91bf34bfb23b57bd80e3c29cd..1759ac8a09461549288bd5409962d8c9bf32c060 100644 (file)
--- a/daemon/libvirtd.service.in
+++ b/daemon/libvirtd.service.in
@@ -1,8 +1,3 @@
-# NB we don't use socket activation. When libvirtd starts it will
-# spawn any virtual machines registered for autostart. We want this
-# to occur on every boot, regardless of whether any client connects
-# to a socket. Thus socket activation doesn't have any benefit
-
 [Unit]
 Description=Virtualization daemon
 Before=libvirt-guests.service

diff --git a/daemon/libvirtd.socket.in b/daemon/libvirtd.socket.in
new file mode 100644 (file)
index 0000000..0915bb3
--- /dev/null
+++ b/daemon/libvirtd.socket.in
@@ -0,0 +1,11 @@
+[Socket]
+ListenStream=@runstatedir@/libvirt/libvirt-sock
+ListenStream=@runstatedir@/libvirt/libvirt-sock-ro
+
+; The following settings must match libvirtd.conf file in order to
+; work as expected because libvirtd can't change them later.
+; SocketMode=0777 is safe only if authentication on the socket is set
+; up.  For further information, please see the libvirtd.conf file.
+SocketMode=0777
+SocketUser=root
+SocketGroup=root

diff --git a/libvirt.spec.in b/libvirt.spec.in
index f491de7f3d1eee8c3672d9dafbd89b78716dbeae..3932313a4b0398339f698d46dae177503df7f867 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1671,11 +1671,13 @@ done
 
     %if %{with_systemd}
         %if %{with_systemd_macros}
-            %systemd_post virtlockd.socket libvirtd.service
+            %systemd_post virtlockd.socket libvirtd.service libvirtd.socket
         %else
 if [ $1 -eq 1 ] ; then
     # Initial installation
-    /bin/systemctl enable virtlockd.socket libvirtd.service >/dev/null 2>&1 || :
+    /bin/systemctl enable \
+        virtlockd.socket \
+        libvirtd.service >/dev/null 2>&1 || :
 fi
         %endif
     %else
@@ -1696,12 +1698,24 @@ fi
 %preun daemon
     %if %{with_systemd}
         %if %{with_systemd_macros}
-            %systemd_preun libvirtd.service virtlockd.socket virtlockd.service
+            %systemd_preun \
+                libvirtd.socket \
+                libvirtd.service \
+                virtlockd.socket \
+                virtlockd.service
         %else
 if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
-    /bin/systemctl --no-reload disable libvirtd.service virtlockd.socket virtlockd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop libvirtd.service virtlockd.socket virtlockd.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable \
+        libvirtd.socket \
+        libvirtd.service \
+        virtlockd.socket \
+        virtlockd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop \
+        libvirtd.socket \
+        libvirtd.service \
+        virtlockd.socket \
+        virtlockd.service > /dev/null 2>&1 || :
 fi
         %endif
     %else
@@ -1858,6 +1872,7 @@ exit 0
 
     %if %{with_systemd}
 %{_unitdir}/libvirtd.service
+%{_unitdir}/libvirtd.socket
 %{_unitdir}/virtlockd.service
 %{_unitdir}/virtlockd.socket
     %else