From 0003cd0dd8e2866ee3bc0ad78f52c9953770566f Mon Sep 17 00:00:00 2001
From: Blake Romero <blake@blkrom.com>
Date: Fri, 20 Sep 2024 17:49:46 +0100
Subject: Disable iwd's DHCP client as it is not working

---
 install.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/install.sh b/install.sh
index a89c482..11f421f 100644
--- a/install.sh
+++ b/install.sh
@@ -235,8 +235,8 @@ basestrap /mnt --needed \
           {iwd,dhcpcd,openntpd,cronie,openssh,ufw,dbus}-dinit
 
 # Enable services
-services="dbus ufw iwd ntpd"
-[[ "${elogind}" == false ]] && services+=" dhcpcd turnstiled seatd"
+services="dbus ufw iwd dhcpcd ntpd"
+[[ "${elogind}" == false ]] && services+=" turnstiled seatd"
 
 # NOTE: do not quote 'services' variable or space is ignored
 for service in ${services}; do
@@ -308,13 +308,18 @@ sed "s/# Misc options/# Misc options\n${pac_options}/g" \
 # Enable firewall
 sed "s/ENABLED=no/ENABLED=yes/" -i /mnt/etc/ufw/ufw.conf
 
+# When using elogind
 if [[ "${elogind}" == false ]]; then
     # Manage rundir with turnstile when not using elogind
     sed "s/manage_rundir = no/manage_rundir = yes/" -i /mnt/etc/turnstile/turnstiled.conf
-else
-    # Use iwd's DHCP client instead of dhcpcd when using elogind
-    [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd
-    printf "[General]\nEnableNetworkConfiguration=true\n" > /mnt/etc/iwd/main.conf
+
+# FIXME: iwd DHCP client not working
+# else
+#     # Enable iwd's DHCP client (in-place of dhcpcd when using elogind)
+#     [[ ! -d /mnt/etc/iwd ]] && mkdir /mnt/etc/iwd
+#     printf "[General]\nEnableNetworkConfiguration=true\n" > /mnt/etc/iwd/main.conf
+#     unlink /mnt/etc/dinit.d/boot.d/dhcpcd
+
 fi
 
 # Set MAKEFLAGS to match CPU threads for faster compiling
-- 
cgit