From 476d768d32b06570be698dd0cfc2a4cdb54dfc40 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 26 Sep 2022 22:17:14 +0200
Subject: ws/minet: fix conflicts with systemd-(networkd|resolved)

---
 roles/ws/minet/templates/connections/dhcpWire.j2 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'roles/ws/minet/templates/connections/dhcpWire.j2')

diff --git a/roles/ws/minet/templates/connections/dhcpWire.j2 b/roles/ws/minet/templates/connections/dhcpWire.j2
index 6afbb8f5..8ac96087 100755
--- a/roles/ws/minet/templates/connections/dhcpWire.j2
+++ b/roles/ws/minet/templates/connections/dhcpWire.j2
@@ -15,8 +15,7 @@ case "$1" in
     ;;
   stop)
     echo "Disconnecting from $DESC_NAME"
-    kill `cat /var/run/dhclient.$SHORT_NAME.pid`
-    rm /var/run/dhclient.$SHORT_NAME.pid
+    dhclient -x -pf /var/run/dhclient.$SHORT_NAME.pid
     deactivate_interface $INTERFACE $MODULE_NAME
     ;;
   *)
-- 
cgit v1.2.3