From: sverdlin <sverdlin@users.noreply.github.com>
Date: Mon, 19 Apr 2021 02:25:33 +0000 (+0200)
Subject: systemd-networkd.socket: Add conflict with shutdown.target (#19348)
X-Git-Tag: v249-rc1~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3181521f92ca78ab6535804fe4e176f3ac78ab79;p=thirdparty%2Fsystemd.git

systemd-networkd.socket: Add conflict with shutdown.target (#19348)

systemd-networkd.socket can re-start systemd-networkd.service in
shutdown and by doing this even stop shutdown.target leaving the
system in halfway-down state.

Fixes #4955.
---

diff --git a/units/systemd-networkd.socket b/units/systemd-networkd.socket
index aa9ad7e02c3..2d8d1c3b910 100644
--- a/units/systemd-networkd.socket
+++ b/units/systemd-networkd.socket
@@ -12,7 +12,8 @@ Description=Network Service Netlink Socket
 Documentation=man:systemd-networkd.service(8) man:rtnetlink(7)
 ConditionCapability=CAP_NET_ADMIN
 DefaultDependencies=no
-Before=sockets.target
+Before=sockets.target shutdown.target
+Conflicts=shutdown.target
 
 [Socket]
 ReceiveBuffer=128M