From 5cf3bc3507b841078d25852672931e8f49d59bb6 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 11 Jan 2024 16:02:29 +0100 Subject: [PATCH] wsdd: Simplify starting/stopping and checking wsdd MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weismüller --- src/initscripts/packages/wsdd | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/initscripts/packages/wsdd b/src/initscripts/packages/wsdd index c5207f872e..274d7cd5ab 100644 --- a/src/initscripts/packages/wsdd +++ b/src/initscripts/packages/wsdd @@ -27,6 +27,8 @@ eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) # Create chroot directory for wsdd mkdir -p /var/run/wsdd +PIDFILE="/var/run/wsdd.pid" + INTERFACES="-i ${GREEN_DEV}" if [ -n "${BLUE_DEV}" ]; then INTERFACES="${INTERFACES} -i ${BLUE_DEV}" @@ -38,22 +40,14 @@ WSDD_CHROOT="-c /var/run/wsdd" case "$1" in start) boot_mesg "Starting wsdd daemon..." - loadproc -b /usr/bin/wsdd -4 ${WSDD_USER} ${INTERFACES} ${WSDD_WORKGROUP} ${WSDD_CHROOT} - sleep 1 - echo $(ps aux | grep "/usr/bin/wsdd" | grep -v grep | awk '{print $2}') > /var/run/wsdd/pid + loadproc -b -p "${PIDFILE}" /usr/bin/wsdd -4 ${WSDD_USER} ${INTERFACES} ${WSDD_WORKGROUP} ${WSDD_CHROOT} ;; stop) boot_mesg "Stopping wsdd daemon..." - killproc -p /var/run/wsdd/pid /usr/bin/wsdd + killproc -p "${PIDFILE}" /usr/bin/wsdd ;; status) - WSDD_PID=$(ps aux | grep "/usr/bin/wsdd" | grep -v grep | awk '{print $2}') - if [ -n "${WSDD_PID}" ]; then - echo -e "\\033[1;36m /usr/bin/wsdd is running with Process"\ - "ID(s) $WSDD_PID.\\033[0;39m" - else - echo -e "\\033[1;36m /usr/bin/wsdd is not running.\\033[0;39m" - fi + statusproc /usr/bin/wsdd ;; *) echo "Usage: $0 (start|stop|status)" -- 2.39.5