From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 5 Jan 2023 16:34:40 +0000 (+0100)
Subject: units: condition systemd-networkd-wait-online.service like systemd-networkd.service
X-Git-Tag: v253-rc1~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=882b011277593e3fe17f00fee67f49cdf7ffbdc5;p=thirdparty%2Fsystemd.git

units: condition systemd-networkd-wait-online.service like systemd-networkd.service

This adds the same condition that systemd-networkd.service already
carries also to systemd-networkd-wait-online.service. Otherwise we'll
potentially see some logs we'd rather not see about a service we BindTo=
not running. Or in other words, if service X binds to Y then X should be
at least as conditioned as Y.
---

diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in
index 09698fc535d..3dc5ce92652 100644
--- a/units/systemd-networkd-wait-online.service.in
+++ b/units/systemd-networkd-wait-online.service.in
@@ -10,6 +10,7 @@
 [Unit]
 Description=Wait for Network to be Configured
 Documentation=man:systemd-networkd-wait-online.service(8)
+ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
 Conflicts=shutdown.target
 BindsTo=systemd-networkd.service