From 882c1ec6b5a24e02ad1288d2f08abdab0e640f54 Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Fri, 8 Jan 2021 10:24:39 +0000 Subject: [PATCH 1/3] qubes-early-vm-config.service: Wants=network-pre.target The unit on the Before= side of network-pre.target also has to pull it in as a dependency: https://www.freedesktop.org/software/systemd/man/systemd.special.html#network-pre.target Fixes QubesOS/qubes-issues#5570 --- vm-systemd/qubes-early-vm-config.service | 1 + 1 file changed, 1 insertion(+) diff --git a/vm-systemd/qubes-early-vm-config.service b/vm-systemd/qubes-early-vm-config.service index dddbc49..8529188 100644 --- a/vm-systemd/qubes-early-vm-config.service +++ b/vm-systemd/qubes-early-vm-config.service @@ -1,6 +1,7 @@ [Unit] Description=Early Qubes VM settings DefaultDependencies=no +Wants=network-pre.target Before=sysinit.target network-pre.target After=local-fs.target qubes-db.service From a28a38146995f3e73ecc9b86e8ee5fdc65f8a022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sat, 9 Jan 2021 05:18:14 +0100 Subject: [PATCH 2/3] rpm: order -systemd post script after -networking qubes-core-agent-networking package brings in new systemd units, which needs to be enabled. Standard %systemd_post macro handles it only on initial installation, but not on update. The function that handle updates is in %post of qubes-core-agent-systemd package. To avoid duplication, simply enforce proper installation order, instead of modifying %post of qubes-core-agent-networking package. OrderWithRequires influences only ordering, but does not introduce actual dependency, so it's still possible to not install qubes-core-agent-networking package. Fixes 0e0c229 "rpm: enable qubes-network-uplink.service on install" --- rpm_spec/core-agent.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in index b9769b0..a34b70f 100644 --- a/rpm_spec/core-agent.spec.in +++ b/rpm_spec/core-agent.spec.in @@ -914,6 +914,8 @@ Conflicts: qubes-core-agent-sysvinit Provides: qubes-core-vm-systemd = %{version}-%{release} Obsoletes: qubes-core-vm-systemd < 4.0.0 Conflicts: qubes-gui-agent < 4.1.0 +# preset units after possibly new are installed +OrderWithRequires(post): qubes-core-agent-networking %description systemd The Qubes core startup configuration for SystemD init. From 1aa3893f440ce3c30f13ec1165090acbb23af7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Sun, 10 Jan 2021 03:14:13 +0100 Subject: [PATCH 3/3] version 4.1.22 --- debian/changelog | 10 ++++++++++ version | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a3a28fa..e9de965 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +qubes-core-agent (4.1.22-1) unstable; urgency=medium + + [ Marek Marczykowski-Górecki ] + * rpm: order -systemd post script after -networking + + [ Rusty Bird ] + * qubes-early-vm-config.service: Wants=network-pre.target + + -- Marek Marczykowski-Górecki Sun, 10 Jan 2021 03:14:13 +0100 + qubes-core-agent (4.1.21-1) unstable; urgency=medium * Fix sudo SELinux settings diff --git a/version b/version index 7fbb627..566261e 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.1.21 +4.1.22