Browse Source

systemd: improve ordering of systemd units

- 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
Marek Marczykowski-Górecki 7 years ago
parent
commit
60d16ea587

+ 0 - 2
vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf

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

+ 3 - 1
vm-systemd/NetworkManager.service.d/30_qubes.conf

@@ -1,7 +1,9 @@
 [Unit]
 ConditionPathExists=/var/run/qubes-service/network-manager
 # 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]
 ExecStartPre=/usr/lib/qubes/network-manager-prepare-conf-dir

+ 0 - 4
vm-systemd/cron.service.d/30_qubes.conf

@@ -1,10 +1,6 @@
 [Unit]
 ConditionPathExists=/var/run/qubes-service/crond
 
-[Unit]
-# For /rw
-After=qubes-misc-post.service qubes-sysinit.service
-
 [Service]
 ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron
 ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron

+ 0 - 4
vm-systemd/crond.service.d/30_qubes.conf

@@ -1,10 +1,6 @@
 [Unit]
 ConditionPathExists=/var/run/qubes-service/crond
 
-[Unit]
-# For /rw
-After=qubes-misc-post.service qubes-sysinit.service
-
 [Service]
 ExecStartPre=/bin/mkdir --mode=0700 -p /rw/cron
 ExecStartPre=/bin/mount --bind /rw/cron /var/spool/cron