ws/minet: fix conflicts with systemd-(networkd|resolved)

10 files changed, 25 insertions, 18 deletions

diff --git a/roles/ws/minet/tasks/main.yml b/roles/ws/minet/tasks/main.yml
index c567a76a..35eafa17 100644
--- a/roles/ws/minet/tasks/main.yml
+++ b/roles/ws/minet/tasks/main.yml
@@ -56,3 +56,19 @@
     owner: root
     group: root
     mode: 0600
+
+- name: disable systemd-networkd service units
+  loop:
+  - systemd-networkd.socket
+  - systemd-networkd.service
+  - systemd-networkd-wait-online.service
+  systemd:
+    name: "{{ item }}"
+    state: stopped
+    masked: yes
+
+- name: create resolvconf symlink to resolvectl
+  file:
+    src: /usr/bin/resolvectl
+    dest: /usr/local/bin/resolvconf
+    state: link
diff --git a/roles/ws/minet/templates/connections/ccc2011Wireless.j2 b/roles/ws/minet/templates/connections/ccc2011Wireless.j2
index c0c1e8a2..9a85c13b 100755
--- a/roles/ws/minet/templates/connections/ccc2011Wireless.j2
+++ b/roles/ws/minet/templates/connections/ccc2011Wireless.j2
@@ -20,8 +20,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
     ;;
   *)
diff --git a/roles/ws/minet/templates/connections/ccc2019Wire.j2 b/roles/ws/minet/templates/connections/ccc2019Wire.j2
index 51f7fef0..553b7c4e 100755
--- a/roles/ws/minet/templates/connections/ccc2019Wire.j2
+++ b/roles/ws/minet/templates/connections/ccc2019Wire.j2
@@ -22,8 +22,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
     ;;
   *)
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
     ;;
   *)
diff --git a/roles/ws/minet/templates/connections/genericWPAWireless.j2 b/roles/ws/minet/templates/connections/genericWPAWireless.j2
index 7321511a..14dc6f57 100755
--- a/roles/ws/minet/templates/connections/genericWPAWireless.j2
+++ b/roles/ws/minet/templates/connections/genericWPAWireless.j2
@@ -16,8 +16,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
     killall wpa_supplicant
     deactivate_interface $INTERFACE $MODULE_NAME
     ;;
diff --git a/roles/ws/minet/templates/connections/tugWireVpnc.j2 b/roles/ws/minet/templates/connections/tugWireVpnc.j2
index 1e261313..cf360665 100755
--- a/roles/ws/minet/templates/connections/tugWireVpnc.j2
+++ b/roles/ws/minet/templates/connections/tugWireVpnc.j2
@@ -18,8 +18,7 @@ case "$1" in
     echo "Disconnecting from $DESC_NAME"
     kill `cat /var/run/vpnc.$SHORT_NAME.pid`
     rm -f /var/run/vpnc.$SHORT_NAME.pid
-    kill `cat /var/run/dhclient.$SHORT_NAME.pid`
-    rm -f /var/run/dhclient.$SHORT_NAME.pid
+    dhclient -x -pf /var/run/dhclient.$SHORT_NAME.pid
     deactivate_interface $INTERFACE $MODULE_NAME
     ;;
   *)
diff --git a/roles/ws/minet/templates/connections/tugWireless.j2 b/roles/ws/minet/templates/connections/tugWireless.j2
index 13062375..f60757cd 100755
--- a/roles/ws/minet/templates/connections/tugWireless.j2
+++ b/roles/ws/minet/templates/connections/tugWireless.j2
@@ -19,8 +19,7 @@ case "$1" in
     echo "Disconnecting from $DESC_NAME"
     kill `cat /var/run/vpnc.$SHORT_NAME.pid`
     rm -f /var/run/vpnc.$SHORT_NAME.pid
-    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
     ;;
   *)
diff --git a/roles/ws/minet/templates/connections/westbusWireless.j2 b/roles/ws/minet/templates/connections/westbusWireless.j2
index d40879e7..eccb9a43 100755
--- a/roles/ws/minet/templates/connections/westbusWireless.j2
+++ b/roles/ws/minet/templates/connections/westbusWireless.j2
@@ -18,8 +18,7 @@ case "$1" in
   stop)
     echo "Disconnecting from $DESC_NAME"
     deactivate_interface $INTERFACE $MODULE_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
     ;;
   *)
     exit 1
diff --git a/roles/ws/minet/templates/openwifi-connection.j2 b/roles/ws/minet/templates/openwifi-connection.j2
index a14b8e70..017cba21 100755
--- a/roles/ws/minet/templates/openwifi-connection.j2
+++ b/roles/ws/minet/templates/openwifi-connection.j2
@@ -17,8 +17,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
     ;;
   *)
diff --git a/roles/ws/minet/templates/wpa-connection.j2 b/roles/ws/minet/templates/wpa-connection.j2
index 19319d65..9aac40ce 100755
--- a/roles/ws/minet/templates/wpa-connection.j2
+++ b/roles/ws/minet/templates/wpa-connection.j2
@@ -18,8 +18,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
     killall wpa_supplicant
     deactivate_interface $INTERFACE $MODULE_NAME
     ;;