Skip to contentSkip to conversation

package/iwd: add basic configuration file

PATCH New Peter Seiderer 2 participants 4 messages Jun 16, 2020 – Jun 17, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/2 package/iwd: add basic configuration file

Add basic /etc/iwd/main.conf configuration file to enable network configuration (use built-in dhcp client).

For the non systemd-resolved case select the openresolv package to fulfill the iwd resolvconf requirement (and adjust the configuration file accordingly).

---
Changes v1 -> v2:
- use printf insteadof echo (Yann E. MORIN)

Changes v2 -> v3:
- select openresolv in all cases but systemd-resloved is enabled
- enable NameResolvingService=systemd in the configuration file only in case of systemd-resloved is enabled, enable NameResolvingService=resolvconf in the configuration file otherwise

Changes v3 -> v4:
- cleanup echo/print vs. printf mess (Baruch Siach)

---
 package/iwd/Config.in |  1 +
 package/iwd/iwd.mk    | 21 +++++++++++++++++++++
 package/iwd/main.conf |  3 +++
 3 files changed, 25 insertions(+)
 create mode 100644 package/iwd/main.conf
package/iwd/Config.in +1 -0
index ec53d13047..4e85fb4fd7 100644
@@ -8,6 +8,7 @@ config BR2_PACKAGE_IWD
 	depends on BR2_USE_WCHAR # ell
 	select BR2_PACKAGE_DBUS # runtime
 	select BR2_PACKAGE_ELL
+	select BR2_PACKAGE_OPENRESOLV if !BR2_PACKAGE_SYSTEMD_RESOLVED
 	help
 	  iNet Wireless daemon (iwd)
 
package/iwd/iwd.mk +21 -0
index 32ff175933..6e4044379d 100644
@@ -46,4 +46,25 @@ else
 IWD_CONF_OPTS += --disable-systemd-service
 endif
 
+define IWD_INSTALL_CONFIG_FILE
+	mkdir -p $(TARGET_DIR)/etc/iwd
+	$(INSTALL) -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf
+endef
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
+define IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
+	printf "[Network]\nNameResolvingService=systemd\n" \
+		>> $(TARGET_DIR)/etc/iwd/main.conf
+endef
+else
+define IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
+	printf "[Network]\nNameResolvingService=resolvconf\n" \
+		>> $(TARGET_DIR)/etc/iwd/main.conf
+endef
+endif
+
+IWD_POST_INSTALL_TARGET_HOOKS += \
+	IWD_INSTALL_CONFIG_FILE \
+	IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
+
 $(eval $(autotools-package))
package/iwd/main.conf new file +3 -0
new file mode 100644
index 0000000000..c26a50d302
@@ -0,0 +1,3 @@
+# use built-in dhcp client
+[General]
+EnableNetworkConfiguration=true
Signature · 1 line
2.27.0
#1 lore raw

PATCH v4 2/2 package/iwd: add sysv init script

---
Changes v1 -> v2:
- use start-stop-daemon (Yann E. MORIN)

Changes v2 -> v3:
- no changes

Changes v3 -> v4:
- no changes

---
 package/iwd/S40iwd | 42 ++++++++++++++++++++++++++++++++++++++++++
 package/iwd/iwd.mk |  7 +++++++
 2 files changed, 49 insertions(+)
 create mode 100644 package/iwd/S40iwd
package/iwd/S40iwd new file +42 -0
new file mode 100644
index 0000000000..6714ca9956
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+DAEMON="/usr/libexec/iwd"
+PIDFILE="/var/run/iwd.pid"
+
+IWD_ARGS=""
+
+[ -r "/etc/default/iwd" ] && . "/etc/default/iwd"
+
+start() {
+	printf "Starting iwd:"
+	mkdir -p /tmp/iwd/hotspot
+	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "$DAEMON" \
+		-- $IWD_ARGS
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+stop() {
+	printf "Stopping iwd:"
+	start-stop-daemon -K -q -p "$PIDFILE"
+	status=$?
+	if [ "$status" -eq 0 ]; then
+		echo "OK"
+	else
+		echo "FAIL"
+	fi
+	return "$status"
+}
+
+case "$1" in
+	start|stop)
+		"$1";;
+	*)
+		echo "Usage: $0 {start|stop}"
+		exit 1
+esac
package/iwd/iwd.mk +7 -0
index 6e4044379d..6b917870ef 100644
@@ -67,4 +67,11 @@ IWD_POST_INSTALL_TARGET_HOOKS += \
 	IWD_INSTALL_CONFIG_FILE \
 	IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
 
+define IWD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D package/iwd/S40iwd \
+		$(TARGET_DIR)/etc/init.d/S40iwd
+	mkdir -p $(TARGET_DIR)/var/lib/iwd
+	ln -sf /tmp/iwd/hotspot $(TARGET_DIR)/var/lib/iwd/hotspot
+endef
+
 $(eval $(autotools-package))
Signature · 1 line
2.27.0
#2 lore raw

PATCH v4 2/2 package/iwd: add sysv init script

Quoted 4 lines · On Tue, 16 Jun 2020 08:34:31 +0200 Peter Seiderer <[email protected]> wrote:

---
Changes v1 -> v2:
- use start-stop-daemon (Yann E. MORIN)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v4 1/2 package/iwd: add basic configuration file

In reply to Peter Seiderer
Quoted 8 lines · On Tue, 16 Jun 2020 08:34:30 +0200 Peter Seiderer <[email protected]> wrote:

Add basic /etc/iwd/main.conf configuration file to enable network configuration (use built-in dhcp client).

For the non systemd-resolved case select the openresolv package to fulfill the iwd resolvconf requirement (and adjust the configuration file accordingly).

I've applied, but I found things a bit too complicated, so I did some simplifications.

package/iwd/iwd.mk else · line 50

Quoted 2 lines
package/iwd/iwd.mk +2 -0
+define IWD_INSTALL_CONFIG_FILE
+	mkdir -p $(TARGET_DIR)/etc/iwd

This is not needed if you use the -D option in $(INSTALL)

Quoted 8 lines
package/iwd/iwd.mk +8 -0
+	$(INSTALL) -m 644 package/iwd/main.conf $(TARGET_DIR)/etc/iwd/main.conf
+endef
+
+ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
+define IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
+	printf "[Network]\nNameResolvingService=systemd\n" \
+		>> $(TARGET_DIR)/etc/iwd/main.conf
+endef

package/iwd/iwd.mk else · line 68

Quoted 10 lines
package/iwd/iwd.mk +10 -0
+else
+define IWD_CONFIG_FILE_NAME_RESOLV_SERVICE
+	printf "[Network]\nNameResolvingService=resolvconf\n" \
+		>> $(TARGET_DIR)/etc/iwd/main.conf
+endef
+endif
+
+IWD_POST_INSTALL_TARGET_HOOKS += \
+	IWD_INSTALL_CONFIG_FILE \
+	IWD_CONFIG_FILE_NAME_RESOLV_SERVICE

This felt too complicated. I simplified like this:

ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
IWD_RESOLV_SERVICE = systemd
else
IWD_RESOLV_SERVICE = resolvconf
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

endef

IWD_POST_INSTALL_TARGET_HOOKS += IWD_INSTALL_CONFIG_FILE

with of course main.conf containing:

# use built-in dhcp client
[General]
EnableNetworkConfiguration=true
[Network]
NameResolvingService=__RESOLV_SERVICE__

Applied with those changes. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com