aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-03-09 00:42:32 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-03-09 00:42:32 +0000
commit165eeeeeefb364ce6c31a7e5fd92ad48deae1560 (patch)
treefc25d2de7435d18b3afd329111ac9a41f23b6d00
parent7990251d83466230399e6028eeb770557a17a8ed (diff)
downloadlcd4linux-165eeeeeefb364ce6c31a7e5fd92ad48deae1560.tar.gz
* Rewrite init script to use lsb-base functions
- fixes issue where invoke-rc.d would return error status during installation
Diffstat (limited to '')
-rw-r--r--debian/changelog6
-rw-r--r--debian/init.d14
2 files changed, 13 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index e01b605..cf19377 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,14 +6,16 @@ lcd4linux (0.11.0~svn1180-1) unstable; urgency=low
- adds new Futaba VFD driver
- adds new Samsung SPF driver
* Update to S-V 3.9.3
- * Rewrite init script to use lsb-base functions.
+ * Rewrite init script to use lsb-base functions
+ - fixes issue where invoke-rc.d would return error status during
+ installation
* Lintian fixes
- spelling-error-in-manpage
- copyright-refers-to-symlink-license
- init.d-script-does-not-implement-optional-option
* Add watchfile lintian override; Using upstream svn instead
- -- Jonathan McCrohan <jmccrohan@gmail.com> Thu, 08 Mar 2012 23:52:02 +0000
+ -- Jonathan McCrohan <jmccrohan@gmail.com> Fri, 09 Mar 2012 00:39:09 +0000
lcd4linux (0.11.0~svn1165-1) unstable; urgency=low
diff --git a/debian/init.d b/debian/init.d
index 2b8e364..010bef9 100644
--- a/debian/init.d
+++ b/debian/init.d
@@ -35,19 +35,23 @@ case "$1" in
chmod 600 /etc/lcd4linux.conf
start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
--exec $DAEMON -- $DAEMON_OPTS
- log_end_msg 0
+ log_end_msg $?
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
- --exec $DAEMON
- log_end_msg 0
+ start-stop-daemon --stop --quiet --retry=TERM/15/KILL/5 \
+ --pidfile /var/run/$NAME.pid --exec $DAEMON
+ log_end_msg $?
;;
restart|force-reload)
- $0 stop && sleep 2 && $0 start
+ $0 stop
+ sleep 2
+ $0 start
;;
status)
status_of_proc $DAEMON "$NAME"
+ status=$?
+ exit $status
;;
*)
N=/etc/init.d/$NAME