From 60d16ea587c8b4e38ab30958f67cd1bebf916893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Wed, 27 Jul 2016 05:13:21 +0200 Subject: [PATCH] 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 --- vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf | 2 -- vm-systemd/NetworkManager.service.d/30_qubes.conf | 4 +++- vm-systemd/cron.service.d/30_qubes.conf | 4 ---- vm-systemd/crond.service.d/30_qubes.conf | 4 ---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf b/vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf index 602321b..0b41d68 100644 --- a/vm-systemd/NetworkManager-wait-online.service.d/30_qubes.conf +++ b/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 diff --git a/vm-systemd/NetworkManager.service.d/30_qubes.conf b/vm-systemd/NetworkManager.service.d/30_qubes.conf index 7daec3f..047cc22 100644 --- a/vm-systemd/NetworkManager.service.d/30_qubes.conf +++ b/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 diff --git a/vm-systemd/cron.service.d/30_qubes.conf b/vm-systemd/cron.service.d/30_qubes.conf index 0e66602..ef02a5e 100644 --- a/vm-systemd/cron.service.d/30_qubes.conf +++ b/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 diff --git a/vm-systemd/crond.service.d/30_qubes.conf b/vm-systemd/crond.service.d/30_qubes.conf index 0e66602..ef02a5e 100644 --- a/vm-systemd/crond.service.d/30_qubes.conf +++ b/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