From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 11 Jan 2024 15:10:04 +0000 (+0100)
Subject: wsdd: Collect static command line arguments in an array
X-Git-Tag: v2.29-core185~145^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb88fd1b69ae27e9c14b97d219879627a473a3d2;p=ipfire-2.x.git

wsdd: Collect static command line arguments in an array

This is easier to handle than a large number of variables.

Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
---

diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd
index 88fe85ae2e..b07fe3ace2 100644
--- a/src/initscripts/packages/wsdd
+++ b/src/initscripts/packages/wsdd
@@ -29,18 +29,27 @@ mkdir -p /var/run/wsdd
 
 PIDFILE="/var/run/wsdd.pid"
 
+ARGS=(
+	# Launch as non-privileged user
+	"--user" "wsdd:wsdd"
+
+	# Launch in chroot
+	"--chroot" "/var/run/wsdd"
+
+	# Only use IPv4
+	"--ipv4only"
+)
+
 INTERFACES="--interface ${GREEN_DEV}"
 if [ -n "${BLUE_DEV}" ]; then
         INTERFACES="${INTERFACES} --interface ${BLUE_DEV}"
 fi
 WSDD_WORKGROUP="--workgroup $(/usr/bin/testparm -s --parameter-name workgroup 2>/dev/null)"
-WSDD_USER="--user wsdd:wsdd"
-WSDD_CHROOT="--chroot /var/run/wsdd"
 
 case "$1" in
 	start)
 		boot_mesg "Starting wsdd daemon..."
-		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd --ipv4only ${WSDD_USER} ${INTERFACES} ${WSDD_WORKGROUP} ${WSDD_CHROOT}
+		loadproc -b -p "${PIDFILE}" /usr/bin/wsdd "${ARGS[@]}" ${INTERFACES} ${WSDD_WORKGROUP}
 		;;
 
 	stop)