From 8536a5d04a6a83d9ec4b4922b99c14a7c4a8ae92 Mon Sep 17 00:00:00 2001 From: Fiona Klute Date: Thu, 4 Jun 2026 17:54:30 +0200 Subject: [PATCH] package/iwd: install upstream main.conf Note this changes EnableNetworkConfiguration from true to false according to the upstream default, users who want a standalone iwd setup which handles DHCP will need to adjust the config. Adjusting NameResolvingService according to selected packages is unlikely to have unexpected effects, so keep that. This makes iwd work as a drop-in replacement for wpa_supplicant with NetworkManager. Signed-off-by: Fiona Klute Signed-off-by: Marcus Hoffmann --- package/iwd/iwd.mk | 4 ++-- package/iwd/main.conf | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 package/iwd/main.conf diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index caecb62d64..76cc00fd22 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -51,8 +51,8 @@ IWD_CONF_OPTS += --disable-monitor endif define IWD_INSTALL_CONFIG_FILE - $(INSTALL) -D -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf - $(SED) 's,__RESOLV_SERVICE__,$(IWD_RESOLV_SERVICE),' $(TARGET_DIR)/etc/iwd/main.conf + $(INSTALL) -D -m 644 $(@D)/doc/main.conf $(TARGET_DIR)/etc/iwd/main.conf + $(SED) 's,#\?\(NameResolvingService\)=.*,\1=$(IWD_RESOLV_SERVICE),' $(TARGET_DIR)/etc/iwd/main.conf endef IWD_POST_INSTALL_TARGET_HOOKS += IWD_INSTALL_CONFIG_FILE diff --git a/package/iwd/main.conf b/package/iwd/main.conf deleted file mode 100644 index 22c1cd7339..0000000000 --- a/package/iwd/main.conf +++ /dev/null @@ -1,5 +0,0 @@ -# use built-in dhcp client -[General] -EnableNetworkConfiguration=true -[Network] -NameResolvingService=__RESOLV_SERVICE__