From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 18 Dec 2013 15:45:20 +0000 (+0100)
Subject: units: run systemd-networkd.service only if CAP_NET_ADMIN capability is around
X-Git-Tag: v209~830
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=74f9e0f20368116fe09f9bf0e5eb0aba08e6ee42

units: run systemd-networkd.service only if CAP_NET_ADMIN capability is around

This has the effect that systemd-networkd won't run in containers
without network namespacing wher CAP_NET_ADMIN is (usually) not
available. It will still run in containers with network namespacing on
(where CAP_NET_ADMIN is usually avilable).

We might remove this condition check again if networkd provides services
to apps that also are useful in containers lacking network namespacing,
however, as long as it doesn't it should be handled like udevd and be
excluded in such containers.
---

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 95205cdee..c12f3983e 100644
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -11,6 +11,7 @@ Documentation=man:systemd-networkd.service(8)
 DefaultDependencies=no
 Before=network.target
 Wants=network.target
+ConditionCapability=CAP_NET_ADMIN
 
 [Service]
 Type=notify