summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElan Ruusamäe2007-03-07 10:13:03 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitc810f89e4eeb5e9304176b2e189ad4d48430bbd5 (patch)
tree1c72858ad40093705e96b59125a0764ad9684a15
parentc000d13b47ea51ff5b7cd49233cbae50367a3ca2 (diff)
download3DM2-9650SE-c810f89e4eeb5e9304176b2e189ad4d48430bbd5.zip
3DM2-9650SE-c810f89e4eeb5e9304176b2e189ad4d48430bbd5.tar.gz
- pldize
Changed files: 3dm2-9650SE.init -> 1.2
-rw-r--r--3dm2-9650SE.init51
1 files changed, 30 insertions, 21 deletions
diff --git a/3dm2-9650SE.init b/3dm2-9650SE.init
index 355b09c..efde754 100644
--- a/3dm2-9650SE.init
+++ b/3dm2-9650SE.init
@@ -17,53 +17,62 @@
RETVAL=0
-# See how we were called.
-case "$1" in
- start)
+start() {
if [ ! -f /var/lock/subsys/3dm2 ]; then
msg_starting "3DM2 Utility"
start-stop-daemon --start --quiet --exec /usr/sbin/3dm2
RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- ok
- touch /var/lock/subsys/3dm2
+ if [ $RETVAL -eq 0 ]; then
+ ok
+ touch /var/lock/subsys/3dm2
else
- fail
- RETVAL=1
+ fail
+ RETVAL=1
fi
else
msg_already_running "3DM2 Utility"
fi
- ;;
- stop)
+}
+
+stop() {
+ # FIXME: stop should NEVER fail with error code
if [ -f /var/lock/subsys/3dm2 ]; then
msg_stopping "3DM2 Utility"
- start-stop-daemon --stop --quiet --exec /usr/sbin/3dm2 1> /dev/null
+ # FIXME: spec needs rc-scripts versioned dep for start-stop-daemon (see PLD-doc/BuildRequires.txt)
+ start-stop-daemon --stop --quiet --exec /usr/sbin/3dm2 > /dev/null
RETVAL=$?
- if [ $RETVAL -eq 0 ]; then
- ok
- rm -f /var/lock/subsys/3dm2
+ if [ $RETVAL -eq 0 ]; then
+ ok
+ rm -f /var/lock/subsys/3dm2
else
- fail
- RETVAL=1
+ fail
+ RETVAL=1
fi
else
msg_not_running "3DM2 Utility"
fi
+}
+
+# See how we were called.
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
;;
status)
status 3dm2
RETVAL=$?
;;
restart)
- $0 stop
+ stop
sleep 2
- $0 start
- RETVAL=$?
+ start
;;
*)
- echo "Usage: $0 {start|stop|status|restart}"
- exit 1
+ msg_usage "$0 {start|stop|status|restart}"
+ exit 3
esac
exit $RETVAL