[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/sid] 2 commits: Don't start or restart socket units on package upgrades

[Guido Günther]

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


Commits:
100e8aa7 by Guido Günther at 2020-04-02T15:17:40+02:00
Don't start or restart socket units on package upgrades

Changes get picked up when the corresponding system unit being restartd.
This avoids problems when socket and service units of the same service get restarted
together. See #955483 for details.

- - - - -
ff981d56 by Guido Günther at 2020-04-02T15:20:33+02:00
Pass --no-auto to dh_instalsystemd

This avoids generation of restart snippets for services listed
in `Also=` sections of the service units. Otherwise these
get restarted but we want to avoid that and let systemd figure
it out all by itself.

See: #955483, #841095

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -135,18 +135,21 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
         $(NULL)
 
 LIBVIRT_SYSTEM_SERVICES = \
+	virtlogd.service \
+	virtlockd.service \
+	$(NULL)
+
+LIBVIRT_NOSTART_UNITS = \
+	libvirt-guests.service \
 	libvirtd.socket \
 	libvirtd-ro.socket \
 	libvirtd-admin.socket \
 	virtlogd.socket \
 	virtlogd-admin.socket \
-	virtlogd.service \
 	virtlockd.socket \
 	virtlockd-admin.socket \
-	virtlockd.service \
 	$(NULL)
 
-
 DEB_BUILDDIR := $(CURDIR)/debian/build
 LOGROTATE = $(basename $(basename $(notdir $(wildcard src/remote/libvirtd*.logrotate.in))))
 SRV_MONOLITHIC = libvirt-guests virtlogd virtlockd libvirtd libvirtd-tcp libvirtd-tls virt-guest-shutdown
@@ -240,9 +243,9 @@ override_dh_installinit:
 	dh_installinit -p libvirt-daemon-system --name=libvirtd --no-scripts
 
 override_dh_installsystemd:
-	dh_installsystemd -p libvirt-daemon-system --restart-after-upgrade libvirtd.service
-	dh_installsystemd -p libvirt-daemon-system --no-stop-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
-	dh_installsystemd -p libvirt-daemon-system --no-start libvirt-guests.service
+	dh_installsystemd -p libvirt-daemon-system --no-also --restart-after-upgrade libvirtd.service
+	dh_installsystemd -p libvirt-daemon-system --no-also --no-stop-on-upgrade $(LIBVIRT_SYSTEM_SERVICES)
+	dh_installsystemd -p libvirt-daemon-system --no-also --no-start $(LIBVIRT_NOSTART_UNITS)
 
 override_dh_installdocs:
 	dh_installdocs -plibvirt-doc --doc-main-package libvirt-doc



View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/ea7b8b7b21a55a4caed9550563a4f73d8812d2ea...ff981d56ff2ff261e10b85003b35d892e6832dcf

-- 
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/ea7b8b7b21a55a4caed9550563a4f73d8812d2ea...ff981d56ff2ff261e10b85003b35d892e6832dcf
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/20200408/48313636/attachment-0001.html>