Merge ~paelzer/ubuntu/+source/libvirt:lp-1990853-autostart-ordering-KINETIC into ubuntu/+source/libvirt:ubuntu/kinetic-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/lp-1990853-autostart-ordering

[Christian Ehrhardt  (paelzer)]

Verified, the PPA fixes the issue as expected.

[Christian Ehrhardt  (paelzer)]

FYI: Autopkgtests are running on the PPA right now

[Christian Ehrhardt  (paelzer)]

Tests completed:
  libvirt @ amd64:
    28.09.22 09:36:18 Log 🗒️ ✅ Triggers: libvirt/8.6.0-0ubuntu2~kineticppa2
  libvirt @ arm64:
    28.09.22 09:41:50 Log 🗒️ ✅ Triggers: libvirt/8.6.0-0ubuntu2~kineticppa2
  libvirt @ armhf:
    28.09.22 09:35:37 Log 🗒️ ✅ Triggers: libvirt/8.6.0-0ubuntu2~kineticppa2
  libvirt @ ppc64el:
    28.09.22 09:42:57 Log 🗒️ ✅ Triggers: libvirt/8.6.0-0ubuntu2~kineticppa2
  libvirt @ s390x:
    28.09.22 09:40:10 Log 🗒️ ✅ Triggers: libvirt/8.6.0-0ubuntu2~kineticppa2

[Miriam España Acebal (mirespace)]

Hi Christian,

I think starting it a the beginning in front of the services is a good idea, and I cannot see other side effects.... you're the expert.

My more far contribution here could double-check the fix with the steps to reproduce from the bug, and I did it, so LGTM.

Sorry for the time in the review and thanks for your work on this.

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, mirespace
Uploaders: paelzer
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, uploaded
Uploading libvirt_8.6.0-0ubuntu2.dsc
Uploading libvirt_8.6.0-0ubuntu2.debian.tar.xz
Uploading libvirt_8.6.0-0ubuntu2_source.buildinfo
Uploading libvirt_8.6.0-0ubuntu2_source.changes

diff --git a/debian/changelog b/debian/changelog
index afeb23f..0fe176e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvirt (8.6.0-0ubuntu2) kinetic; urgency=medium
+
+  * d/p/libvirt-daemon-system.postinst: default network autostart
+    handling needs to happen before services start (LP: #1990853)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 28 Sep 2022 08:36:15 +0200
+
 libvirt (8.6.0-0ubuntu1) kinetic; urgency=medium
 
   * Merge 8.0.0 from Debian unstable (LP: #1971289)
diff --git a/debian/libvirt-daemon-system.postinst b/debian/libvirt-daemon-system.postinst
index 514d39a..3243d80 100644
--- a/debian/libvirt-daemon-system.postinst
+++ b/debian/libvirt-daemon-system.postinst
@@ -298,6 +298,13 @@ case "$1" in
             fi
         done
 
+        # On an initial package install, create the default network autostart
+        # symlink if on a system that it will work on.
+        # Note: needs to complete before services are started the first time
+        if [ -z $2 ]; then
+            maybe_set_autostart
+        fi
+
         systemd_daemon_reload
         systemd_unit_enable virtlockd.service virtlockd.socket virtlockd-admin.socket
         systemd_unit_enable virtlogd.service virtlogd.socket virtlogd-admin.socket
@@ -310,12 +317,6 @@ case "$1" in
         systemd_unit_start libvirtd.socket libvirtd-admin.socket libvirtd-ro.socket
         systemd_unit_restart libvirtd.service
         systemd_unit_start libvirt-guests.service
-
-        # On an initial package install, create the default network autostart
-        # symlink if on a system that it will work on.
-        if [ -z $2 ]; then
-            maybe_set_autostart
-        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)