hostap-daemon: improve init script (based on Debian package)

diff --git a/packages/hostap/hostap-daemon-0.6.3/init b/packages/hostap/hostap-daemon-0.6.3/init
deleted file mode 100644 (file)
index 79f74b6..0000000
--- a/packages/hostap/hostap-daemon-0.6.3/init
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-DAEMON=/usr/sbin/hostapd
-NAME=hostapd
-DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf -B"
-
-test -f $DAEMON || exit 0
-
-set -e
-
-case "$1" in
-    start)
-       echo -n "Starting $DESC: "
-       start-stop-daemon -S -x $DAEMON -- $ARGS
-       echo "$NAME."
-       ;;
-    stop)
-       echo -n "Stopping $DESC: "
-       start-stop-daemon -K -x $DAEMON
-       echo "$NAME."
-       ;;
-    restart)
-       $0 stop
-       $0 start
-       ;;
-    reload)
-       echo -n "Reloading $DESC: "
-       killall -HUP $(basename ${DAEMON})
-       echo "$NAME."
-       ;;
-    *)
-       echo "Usage: $0 {start|stop|restart|reload}"
-       exit 1
-       ;;
-esac
-
-exit 0

diff --git a/packages/hostap/hostap-daemon/init b/packages/hostap/hostap-daemon/init
index ed4c9de..79f74b6 100644 (file)
--- a/packages/hostap/hostap-daemon/init
+++ b/packages/hostap/hostap-daemon/init
@@ -2,7 +2,7 @@
 DAEMON=/usr/sbin/hostapd
 NAME=hostapd
 DESC="HOSTAP Daemon"
-ARGS="/etc/hostapd.conf"
+ARGS="/etc/hostapd.conf -B"
 
 test -f $DAEMON || exit 0
 
@@ -10,25 +10,23 @@ set -e
 
 case "$1" in
     start)
-        echo -n "starting $DESC: $NAME... "
-       start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
-       echo "done."
+       echo -n "Starting $DESC: "
+       start-stop-daemon -S -x $DAEMON -- $ARGS
+       echo "$NAME."
        ;;
     stop)
-        echo -n "stopping $DESC: $NAME... "
-       start-stop-daemon -K -n $NAME
-       echo "done."
+       echo -n "Stopping $DESC: "
+       start-stop-daemon -K -x $DAEMON
+       echo "$NAME."
        ;;
     restart)
-        echo "restarting $DESC: $NAME... "
-       $0 stop
+       $0 stop
        $0 start
-       echo "done."
        ;;
     reload)
-       echo -n "reloading $DESC: $NAME... "
-       killall -HUP $(basename ${DAEMON})
-       echo "done."
+       echo -n "Reloading $DESC: "
+       killall -HUP $(basename ${DAEMON})
+       echo "$NAME."
        ;;
     *)
        echo "Usage: $0 {start|stop|restart|reload}"