From ca03e093f7a793b5320b92f16c01f44a6f8d034e Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Thu, 30 Jun 2016 15:41:14 +0000 Subject: [PATCH] Order network management units after network-pre.target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Network management software should order itself after network-pre.target (man 7 systemd.special) so that other units can order themselves before the *beginning* of network initialization. (qubes-misc-post too because it calls setup-ip.) Relevant for QubesOS/qubes-issues#2108 --- vm-systemd/qubes-misc-post.service | 2 +- vm-systemd/qubes-netwatcher.service | 2 +- vm-systemd/qubes-network.service | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vm-systemd/qubes-misc-post.service b/vm-systemd/qubes-misc-post.service index bd29ab2..5cc9819 100644 --- a/vm-systemd/qubes-misc-post.service +++ b/vm-systemd/qubes-misc-post.service @@ -1,6 +1,6 @@ [Unit] Description=Qubes misc post-boot actions -After=qubes-dvm.service qubes-mount-dirs.service +After=network-pre.target qubes-dvm.service qubes-mount-dirs.service [Service] Type=oneshot diff --git a/vm-systemd/qubes-netwatcher.service b/vm-systemd/qubes-netwatcher.service index 569357a..e25359d 100644 --- a/vm-systemd/qubes-netwatcher.service +++ b/vm-systemd/qubes-netwatcher.service @@ -1,7 +1,7 @@ [Unit] Description=Qubes network monitor ConditionPathExists=/var/run/qubes-service/qubes-netwatcher -After=qubes-firewall.service +After=network-pre.target qubes-firewall.service [Service] ExecStart=/usr/sbin/qubes-netwatcher diff --git a/vm-systemd/qubes-network.service b/vm-systemd/qubes-network.service index b159441..4cb5412 100644 --- a/vm-systemd/qubes-network.service +++ b/vm-systemd/qubes-network.service @@ -2,7 +2,7 @@ Description=Qubes network forwarding setup ConditionPathExists=/var/run/qubes-service/qubes-network Before=network.target -After=qubes-iptables.service +After=network-pre.target qubes-iptables.service [Service] Type=oneshot