From 5432aa5e60c851d3a73bd4204d6b2c7adbb538b1 Mon Sep 17 00:00:00 2001
From: Ahmed Abdelhalim <pm@a14m.dev>
Date: Sat, 16 Aug 2025 02:04:33 +0200
Subject: Fix conflicting NetworkManger/systemd-networkd

---
 roles/network/handlers/main.yml        | 14 ++++++++++++--
 roles/network/tasks/install-debian.yml |  2 ++
 roles/network/tasks/main.yml           |  1 +
 roles/network/vars/debian.yml          |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'roles/network')

diff --git a/roles/network/handlers/main.yml b/roles/network/handlers/main.yml
index 82634b3d..bd249b23 100644
--- a/roles/network/handlers/main.yml
+++ b/roles/network/handlers/main.yml
@@ -17,9 +17,10 @@
   become: true
   ansible.builtin.systemd_service:
     name: "systemd-networkd"
-    enabled: true
-    state: "restarted"
+    enabled: false
+    state: "stopped"
   when: not ansible_is_chroot
+  failed_when: false
 
 - name: "Restart systemd-resolved"
   become: true
@@ -28,3 +29,12 @@
     enabled: true
     state: "restarted"
   when: not ansible_is_chroot
+  failed_when: false
+
+- name: "Restart dhcpcd"
+  become: true
+  ansible.builtin.systemd_service:
+    name: "dhcpcd"
+    enabled: true
+    state: "restarted"
+  when: not ansible_is_chroot
diff --git a/roles/network/tasks/install-debian.yml b/roles/network/tasks/install-debian.yml
index a5367762..4c09c1c9 100644
--- a/roles/network/tasks/install-debian.yml
+++ b/roles/network/tasks/install-debian.yml
@@ -12,6 +12,8 @@
       - "avahi-daemon"
       - "networking"
       - "wpa_supplicant"
+      - "resolvconf"
+      - "systemd-networkd"
 
 - name: "Stop/Disable conflicting services"
   become: true
diff --git a/roles/network/tasks/main.yml b/roles/network/tasks/main.yml
index f96b2c41..28a4b56d 100644
--- a/roles/network/tasks/main.yml
+++ b/roles/network/tasks/main.yml
@@ -28,6 +28,7 @@
     - "Restart NetworkManager"
     - "Restart systemd-networkd"
     - "Restart systemd-resolved"
+    - "Restart dhcpcd"
   block:
     - name: "Configure systemd-resolved"
       ansible.builtin.template:
diff --git a/roles/network/vars/debian.yml b/roles/network/vars/debian.yml
index 931a33e6..20985d98 100644
--- a/roles/network/vars/debian.yml
+++ b/roles/network/vars/debian.yml
@@ -3,8 +3,8 @@ network_packages:
   - "dhcpcd"
   - "systemd-resolved"
   - "network-manager"
+  - "dnsutils"
 
 network_services:
   - "systemd-resolved"
-  - "systemd-networkd"
   - "NetworkManager"
-- 
cgit v1.2.3