Please find attached the patch. I changed two indentation errors as well
and introduced a new PIDFILE variable.
Best Regards,
Bernhard
diff --git a/debian/conserver-server.init b/debian/conserver-server.init
index bb3cb05..1f8d702 100644
--- a/debian/conserver-server.init
+++ b/debian/conserver-server.init
@@ -16,6 +16,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/conserver
NAME=conserver
DESC=conserver
+PIDFILE=/var/run/conserver.pid
conf=/etc/conserver/server.conf
localconf=/etc/conserver/server.local
OPTS=
@@ -30,6 +31,8 @@ fi
test -f $DAEMON || exit 0
+. /lib/lsb/init-functions
+
set -e
case "$1" in
@@ -40,8 +43,8 @@ case "$1" in
start-stop-daemon --background --start \
--quiet --exec $DAEMON -- -d $OPTS
else
- touch /var/run/conserver.pid
- chown -R conservr:adm /var/log/conserver /var/run/conserver.pid
+ touch $PIDFILE
+ chown -R conservr:adm /var/log/conserver $PIDFILE
start-stop-daemon --chuid conservr --background --start \
--quiet --exec $DAEMON -- -d $OPTS
fi
@@ -49,22 +52,25 @@ case "$1" in
;;
stop)
echo -n "Stopping $DESC: "
- start-stop-daemon --stop --oknodo --quiet --pidfile /var/run/$NAME.pid
+ start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE
echo "$NAME."
;;
+ status)
+ status_of_proc -p $PIDFILE $DAEMON "$DESC"
+ ;;
reload|force-reload)
#
echo "Reloading $DESC configuration files."
- start-stop-daemon --stop --signal 1 --quiet --pidfile /var/run/$NAME.pid
- ;;
+ start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
+ ;;
rotate)
#
# make conserver quietly reopen it's log files
#
- if [ -f /var/run/$NAME.pid ]; then
- kill -USR2 `cat /var/run/$NAME.pid`
+ if [ -f $PIDFILE ]; then
+ kill -USR2 `cat $PIDFILE`
fi
- ;;
+ ;;
restart)
#
# If the "reload" option is implemented, move the "force-reload"
@@ -72,7 +78,7 @@ case "$1" in
# just the same as "restart".
#
echo -n "Restarting $DESC: "
- start-stop-daemon --stop --oknodo --quiet --pidfile /var/run/$NAME.pid
+ start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE
sleep 1
if [ "$ASROOT" ]; then
start-stop-daemon --background --start \
@@ -85,7 +91,7 @@ case "$1" in
;;
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|force-reload|rotate}" >&2
+ echo "Usage: $N {start|stop|restart|reload|force-reload|status|rotate}" >&2
exit 1
;;
esac
diff --git a/debian/control b/debian/control
index 8785662..1ebe6c3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Homepage: http://www.conserver.com/
Package: conserver-server
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.0-6)
Description: connect multiple user to a serial console with logging
Conserver is an application that allows multiple users to watch a
serial console at the same time. It can log the data, allows users