Merge commit '1aa3893f440ce3c30f13ec1165090acbb23af7ad'

This commit is contained in:
Demi Marie Obenour 2021-01-11 12:47:54 -05:00
commit 9801dd7d16
No known key found for this signature in database
GPG Key ID: 28A45C93B0B5B6E0
4 changed files with 14 additions and 1 deletions

10
debian/changelog vendored
View File

@ -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 <marmarek@invisiblethingslab.com> Sun, 10 Jan 2021 03:14:13 +0100
qubes-core-agent (4.1.21-1) unstable; urgency=medium qubes-core-agent (4.1.21-1) unstable; urgency=medium
* Fix sudo SELinux settings * Fix sudo SELinux settings

View File

@ -914,6 +914,8 @@ Conflicts: qubes-core-agent-sysvinit
Provides: qubes-core-vm-systemd = %{version}-%{release} Provides: qubes-core-vm-systemd = %{version}-%{release}
Obsoletes: qubes-core-vm-systemd < 4.0.0 Obsoletes: qubes-core-vm-systemd < 4.0.0
Conflicts: qubes-gui-agent < 4.1.0 Conflicts: qubes-gui-agent < 4.1.0
# preset units after possibly new are installed
OrderWithRequires(post): qubes-core-agent-networking
%description systemd %description systemd
The Qubes core startup configuration for SystemD init. The Qubes core startup configuration for SystemD init.

View File

@ -1 +1 @@
4.1.21 4.1.22

View File

@ -1,6 +1,7 @@
[Unit] [Unit]
Description=Early Qubes VM settings Description=Early Qubes VM settings
DefaultDependencies=no DefaultDependencies=no
Wants=network-pre.target
Before=sysinit.target network-pre.target Before=sysinit.target network-pre.target
After=local-fs.target qubes-db.service After=local-fs.target qubes-db.service