ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Zbigniew Jędrzejewski-Szmek 62fe94
From 4bd5ace3e78ec0ca4c174bc875e3d9f6e1ae7405 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek 62fe94
From: Tom Gundersen <teg@jklm.no>
Zbigniew Jędrzejewski-Szmek 62fe94
Date: Sat, 6 Sep 2014 22:37:31 +0200
Zbigniew Jędrzejewski-Szmek 62fe94
Subject: [PATCH] units: networkd - order after udev
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
This way we are sure that /dev/net/tun has been given the right permissions before we try to connect to it.
Zbigniew Jędrzejewski-Szmek 62fe94
Ideally, we should create tun/tap devices over netlink, and then this whole issue would go away.
Zbigniew Jędrzejewski-Szmek 62fe94
---
Zbigniew Jędrzejewski-Szmek 62fe94
 units/systemd-networkd.service.in | 4 +++-
Zbigniew Jędrzejewski-Szmek 62fe94
 1 file changed, 3 insertions(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek 62fe94
Zbigniew Jędrzejewski-Szmek 62fe94
diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
Zbigniew Jędrzejewski-Szmek 62fe94
index f33c65e6ff..fe92da2123 100644
Zbigniew Jędrzejewski-Szmek 62fe94
--- a/units/systemd-networkd.service.in
Zbigniew Jędrzejewski-Szmek 62fe94
+++ b/units/systemd-networkd.service.in
Zbigniew Jędrzejewski-Szmek 62fe94
@@ -10,7 +10,9 @@ Description=Network Service
Zbigniew Jędrzejewski-Szmek 62fe94
 Documentation=man:systemd-networkd.service(8)
Zbigniew Jędrzejewski-Szmek 62fe94
 ConditionCapability=CAP_NET_ADMIN
Zbigniew Jędrzejewski-Szmek 62fe94
 DefaultDependencies=no
Zbigniew Jędrzejewski-Szmek 62fe94
-After=dbus.service network-pre.target systemd-sysusers.service
Zbigniew Jędrzejewski-Szmek 62fe94
+# dbus.service can be dropped once on kdbus, and systemd-udevd.service can be
Zbigniew Jędrzejewski-Szmek 62fe94
+# dropped once tuntap is moved to netlink
Zbigniew Jędrzejewski-Szmek 62fe94
+After=systemd-udevd.service dbus.service network-pre.target systemd-sysusers.service
Zbigniew Jędrzejewski-Szmek 62fe94
 Before=network.target multi-user.target shutdown.target
Zbigniew Jędrzejewski-Szmek 62fe94
 Conflicts=shutdown.target
Zbigniew Jędrzejewski-Szmek 62fe94
 Wants=network.target