Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

systemd: order units checking for qubes-service after qubes-sysinit

Browse Source 
Files in /var/run/qubes-service are created by qubes-sysinit.service. So
defer that condition check after that service start.

Thanks @adrelanos for the report.

Fixes QubesOS/qubes-issues#1985
This commit is contained in:
Marek Marczykowski-Górecki 2016-05-12 00:15:14 +02:00
parent b553f5c7b4
commit 5e08e2bc1d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
17 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vm-systemd/ModemManager.service.d/30_qubes.conf
View File

@ -1,3 +1,4 @@
[Unit] [Unit]
ConditionPathExists=|/var/run/qubes-service/network-manager ConditionPathExists=|/var/run/qubes-service/network-manager
ConditionPathExists=|/var/run/qubes-service/modem-manager ConditionPathExists=|/var/run/qubes-service/modem-manager
After=qubes-sysinit.service

2
vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf
View File

@ -1,4 +1,4 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/network-manager ConditionPathExists=/var/run/qubes-service/network-manager
# For /rw # For /rw
After=qubes-misc-post.service After=qubes-misc-post.service qubes-sysinit.service

2
vm-systemd/NetworkManager.service.d/30_qubes.conf
View File

@ -1,7 +1,7 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/network-manager ConditionPathExists=/var/run/qubes-service/network-manager
# For /rw # For /rw
After=qubes-misc-post.service After=qubes-misc-post.service qubes-sysinit.service
[Service] [Service]
ExecStartPre=/usr/lib/qubes/network-manager-prepare-conf-dir ExecStartPre=/usr/lib/qubes/network-manager-prepare-conf-dir

1
vm-systemd/chronyd.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/ntpd ConditionPathExists=/var/run/qubes-service/ntpd
After=qubes-sysinit.service

2
vm-systemd/cron.service.d/30_qubes.conf
View File

@ -3,7 +3,7 @@ ConditionPathExists=/var/run/qubes-service/crond
[Unit] [Unit]
# For /rw # For /rw
After=qubes-misc-post.service After=qubes-misc-post.service qubes-sysinit.service
[Service] [Service]
ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron

2
vm-systemd/crond.service.d/30_qubes.conf
View File

@ -3,7 +3,7 @@ ConditionPathExists=/var/run/qubes-service/crond
[Unit] [Unit]
# For /rw # For /rw
After=qubes-misc-post.service After=qubes-misc-post.service qubes-sysinit.service
[Service] [Service]
ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron

1
vm-systemd/cups.path.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/cups.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/cups.socket.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/getty@tty.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/getty@tty ConditionPathExists=/var/run/qubes-service/getty@tty
After=qubes-sysinit.service

1
vm-systemd/netfilter-persistent.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/netfilter-persistent ConditionPathExists=/var/run/qubes-service/netfilter-persistent
After=qubes-sysinit.service

1
vm-systemd/network-manager.service.d/30_qubes.conf
View File

@ -1,3 +1,4 @@
# Disable sysinit version of network-manager (wheezy) # Disable sysinit version of network-manager (wheezy)
[Unit] [Unit]
ConditionPathExists=!/var/run/qubes-service ConditionPathExists=!/var/run/qubes-service
After=qubes-sysinit.service

1
vm-systemd/ntpd.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/ntpd ConditionPathExists=/var/run/qubes-service/ntpd
After=qubes-sysinit.service

1
vm-systemd/org.cups.cupsd.path.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/org.cups.cupsd.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/org.cups.cupsd.socket.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/cups ConditionPathExists=/var/run/qubes-service/cups
After=qubes-sysinit.service

1
vm-systemd/tor.service.d/30_qubes.conf
View File

@ -1,2 +1,3 @@
[Unit] [Unit]
ConditionPathExists=!/var/run/qubes/this-is-templatevm ConditionPathExists=!/var/run/qubes/this-is-templatevm
After=qubes-sysinit.service