[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/sid] 3 commits: Revert "Disable libvirtd socket activation" (Closes: #935883)

[Guido Günther]

Guido Günther pushed to branch debian/sid at Libvirt Packaging Team / libvirt


Commits:
4dcbe933 by Andrea Bolognani at 2019-08-28T17:33:13Z
Revert "Disable libvirtd socket activation" (Closes: #935883)

Turns out socket activation for libvirtd actually works fine, and
furthermore not having it enabled along with the default timeout
for libvirtd now being 120 seconds results in clients no longer
being able to use libvirt two short minutes after boot.

This reverts commit b8e92da4ff0af742f5de055ace97503c778a8484.

- - - - -
b464de16 by Andrea Bolognani at 2019-08-28T17:38:48Z
Add libvirtd sockets handling

- - - - -
1264fe50 by Andrea Bolognani at 2019-08-28T17:39:22Z
Document changes and release 5.6.0-2

- - - - -


4 changed files:

- debian/changelog
- − debian/patches/debian/Disable-libvirtd-socket-activation.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+libvirt (5.6.0-2) unstable; urgency=medium
+
+  * Team upload.
+
+  * [4dcbe93] Revert "Disable libvirtd socket activation" (Closes: #935883)
+  * [b464de1] Add libvirtd sockets handling
+
+ -- Andrea Bolognani <eof at kiyuko.org>  Wed, 28 Aug 2019 19:39:00 +0200
+
 libvirt (5.6.0-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/debian/Disable-libvirtd-socket-activation.patch deleted
=====================================
@@ -1,29 +0,0 @@
-From: Andrea Bolognani <eof at kiyuko.org>
-Date: Sat, 24 Aug 2019 18:00:00 +0200
-Subject: debian: Disable libvirtd socket activation
-
-It's currently broken upstream.
----
- src/remote/libvirtd.service.in | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 143dd7f..0fc50dc 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -2,9 +2,6 @@
- Description=Virtualization daemon
- Requires=virtlogd.socket
- Requires=virtlockd.socket
--Requires=libvirtd.socket
--Requires=libvirtd-ro.socket
--Requires=libvirtd-admin.socket
- Wants=systemd-machined.service
- Before=libvirt-guests.service
- After=network.target
-@@ -44,5 +41,3 @@ TasksMax=32768
- WantedBy=multi-user.target
- Also=virtlockd.socket
- Also=virtlogd.socket
--Also=libvirtd.socket
--Also=libvirtd-ro.socket


=====================================
debian/patches/series
=====================================
@@ -17,5 +17,4 @@ debian/Prefer-sbin-over-usr-sbin.patch
 Include-etc-pki-qemu-in-apparmor.patch
 virt-aa-helper-Fix-AppArmor-profile.patch
 virt-aa-helper-Actually-fix-AppArmor-profile.patch
-debian/Disable-libvirtd-socket-activation.patch
 apparmor-Allow-run-pygrub.patch


=====================================
debian/rules
=====================================
@@ -139,6 +139,9 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
         $(NULL)
 
 LIBVIRT_SYSTEM_SERVICES = \
+	libvirtd.socket \
+	libvirtd-ro.socket \
+	libvirtd-admin.socket \
 	libvirt-guests.service \
 	virtlogd.socket \
 	virtlogd-admin.socket \
@@ -188,10 +191,6 @@ override_dh_install-arch:
 	cp debian/polkit/60-libvirt.pkla \
 	    debian/libvirt-daemon-system/var/lib/polkit-1/localauthority/10-vendor.d/
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
-	# Socket activation for libvirtd is currently broken. Fixes are being
-	# worked on upstream, but until they are in place it's much better for
-	# us to pretend the feature doesn't exist at all
-	rm -f debian/tmp/usr/lib/systemd/system/libvirtd*.socket
 	# Linux supports more nice things:
 	dh_install -p libvirt-daemon-system usr/lib/systemd/system lib/systemd/
 	dh_install -p libvirt-daemon-system usr/lib/libvirt/virt-aa-helper



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/be1b5700d635dd779b01243b8da6042f81ba772c...1264fe508d5177c5a6abbcfe25ff9d2ed4aefa25

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/compare/be1b5700d635dd779b01243b8da6042f81ba772c...1264fe508d5177c5a6abbcfe25ff9d2ed4aefa25
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20190831/9d501bce/attachment-0001.html>