From 4555baae98f8de055690d4d5c57e66b65156037f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 5 May 2022 18:33:37 +0200
Subject: Merging upstream version 20220505.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 libexec/container/stop | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'libexec/container/stop')

diff --git a/libexec/container/stop b/libexec/container/stop
index d2db38e..cb85c8d 100755
--- a/libexec/container/stop
+++ b/libexec/container/stop
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+# Copyright (C) 2014-2022 Daniel Baumann <daniel.baumann@open-infrastructure.net>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -146,6 +146,13 @@ then
 	exit 1
 fi
 
+if systemctl status systemd-networkd > /dev/null 2>&1
+then
+	NETWORK_SUBSYSTEM="systemd-networkd"
+else
+	NETWORK_SUBSYSTEM="ifupdown"
+fi
+
 # Pre hooks
 for FILE in "${HOOKS}/pre-${COMMAND}".* "${HOOKS}/${NAME}.pre-${COMMAND}"
 do
@@ -220,7 +227,16 @@ case "${CLEAN}" in
 				for VETH in ${VETHS}
 				do
 					INTERFACE="$(echo ${VETH} | awk -F: '{ print $1 }')"
-					FILE="/run/systemd/network/${INTERFACE}.network"
+
+					case "${NETWORK_SUBSYSTEM}" in
+						ifupdown)
+							FILE="/etc/network/interfaces.d/${INTERFACE}"
+							;;
+
+						systemd-networkd)
+							FILE="/run/systemd/network/${INTERFACE}.network"
+							;;
+					esac
 
 					if [ -f "${FILE}" ]
 					then
-- 
cgit v1.2.3