suzanne.soy/qubes-core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemd: improve ordering of systemd units

Browse Source 
- qubes-misc-post.service is no longer responsible for mounting /rw
- both qubes-sysinit.service and qubes-mount-dirs.service are part of
  basic.target, so no need to mention them explicitly (as long as
  DefaultDependencies=yes)

QubesOS/qubes-issues#2198

(cherry picked from commit 60d16ea587)
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-27 05:13:21 +02:00
parent 5266da4dad
commit d7df915c5b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,7 +1,9 @@
[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 qubes-sysinit.service After=qubes-mount-dirs.service
# For /var/run/qubes-service
After=qubes-sysinit.service
[Service] [Service]
ExecStartPre=/usr/lib/qubes/network-manager-prepare-conf-dir ExecStartPre=/usr/lib/qubes/network-manager-prepare-conf-dir

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

@ -1,10 +1,6 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/crond ConditionPathExists=/var/run/qubes-service/crond
[Unit]
# For /rw
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
ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron

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

@ -1,10 +1,6 @@
[Unit] [Unit]
ConditionPathExists=/var/run/qubes-service/crond ConditionPathExists=/var/run/qubes-service/crond
[Unit]
# For /rw
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
ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron