Bug#1119154: init-d-script: provide setpriv logic in a reusable form

[Mark Hindley]

Control: tags -1 patch

Andrew,

Thanks.

Does this do what you want?

Mark

commit 12d5d1b2907d8acf161cd161e78ce93508627afa
Author: Mark Hindley <mark at hindley.org.uk>
Date:   Tue Oct 28 09:33:48 2025 +0000

    init-d-script: move test for setpriv availability to top level.
    
    Closes: #1119154

diff --git a/debian/init-d-script b/debian/init-d-script
index 56aa9b42..37a6790b 100755
--- a/debian/init-d-script
+++ b/debian/init-d-script
@@ -65,12 +65,6 @@ oneshot() {
 #
 
 do_start_cmd() {
-	if [ "$SETPRIV_ARGS" ]; then
-		if ! PATH=/bin:/usr/bin command -v setpriv >/dev/null 2>&1; then
-			echo "WARNING: setpriv not available, ignoring SETPRIV_ARGS" >&2
-			unset SETPRIV_ARGS
-		fi
-	fi
 	${SETPRIV_ARGS:+setpriv $SETPRIV_ARGS} start-stop-daemon --start --quiet \
 		${PIDFILE:+--pidfile "$PIDFILE"} \
 		${COMMAND_NAME:+--name "$COMMAND_NAME"} \
@@ -264,6 +258,14 @@ if ! is_call_implemented do_reload; then
 	fi
 fi
 
+# Check if setpriv is available
+if [ "$SETPRIV_ARGS" ]; then
+	if ! PATH=/bin:/usr/bin command -v setpriv >/dev/null 2>&1; then
+		echo "WARNING: setpriv not available, ignoring SETPRIV_ARGS" >&2
+		unset SETPRIV_ARGS
+	fi
+fi
+
 case "$1" in
 	start)
 		call do_start