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/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. diff --git a/version b/version index 7fbb627..566261e 100644 --- a/version +++ b/version @@ -1 +1 @@ -4.1.21 +4.1.22 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