- cosmetics, add try-restart; correct runlevel

[packages/binfmt-detector.git] / binfmt-detector.init

diff --git a/binfmt-detector.init b/binfmt-detector.init
index 07c561bcec962815e22c5cb0ee3a06bb22c337d3..a8a3a9a84d77e7a8218cf71ce46fb73ff87a29c3 100644 (file)
--- a/binfmt-detector.init
+++ b/binfmt-detector.init
@@ -1,59 +1,90 @@
 #!/bin/sh
 # $Id$
 #
-# binfmt-detector:     Microsoft PE executable type detector. User can run
-#                      programs using Wine or Mono simply by clicking on them
-#                      or typing /file.exe
+# binfmt-detector:     Microsoft PE executable type detector.
 #
-# chkconfig:   2345 95 10
+# chkconfig:   2345 95 05
 #
-# description: Microsoft PE executable type detector. User can run
-#              programs using Wine or Mono simply by clicking on them
-#              or typing /file.exe
+# description: Microsoft PE executable type detector. User can run \
+#              programs using Wine or Mono simply by clicking on them \
+#              or typing ./file.exe
 #
 
 # Source function library
 . /etc/rc.d/init.d/functions
 
-BINFMT_DIR='/proc/sys/fs/binfmt_misc'
+BINFMT_DIR=/proc/sys/fs/binfmt_misc
 
+[ -d $BINFMT_DIR ] || exit 0
 
-case "$1" in
-  start|reload|force-reload)
-       if [ ! -f /var/lock/subsys/binfmt-detector ]; then
-               # check if binfmt_misc is not already mounted
-               if ! /bin/mount | grep -q "${BINFMT_DIR} type binfmt_misc"; then
-                       /bin/mount none -t binfmt_misc /proc/sys/fs/binfmt_misc
-               fi
-               msg_starting "binfmt-detector"
-               echo ':windows:M::MZ::/usr/bin/binfmt-detector.sh:' > ${BINFMT_DIR}/register
-               echo ':windowsPE:M::PE::/usr/bin/binfmt-detector.sh:' > ${BINFMT_DIR}/register
+start() {
+       if [ -f /var/lock/subsys/binfmt-detector ]; then
+               msg_already_running "binfmt detector"
+               return
+       fi
+
+       # check if binfmt_misc is not already mounted
+       if ! grep -q ${BINFMT_DIR} /proc/mounts; then
+               /bin/mount none -t binfmt_misc ${BINFMT_DIR}
+       fi
+       msg_starting "binfmt detector"
+       if [ -e "$BINFMT_DIR/register" ]; then
+               echo ':windows:M::MZ::/usr/bin/binfmt-detector:' > ${BINFMT_DIR}/register
+               echo ':windowsPE:M::PE::/usr/bin/binfmt-detector:' > ${BINFMT_DIR}/register
                ok
                touch /var/lock/subsys/binfmt-detector
        else
-               msg_already_running "binfmt-detector"
+               fail
        fi
-       ;;
-  stop)
-        if [ -f /var/lock/subsys/binfmt-detector ]; then
-               msg_stopping "binfmt-detector"
-               echo "-1" > ${BINFMT_DIR}/windows
-               echo "-1" > ${BINFMT_DIR}/windowsPE
-               rm -f /var/lock/subsys/binfmt-detector
-               ok
-       else
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/binfmt-detector ]; then
+               msg_not_running "binfmt detector"
+               return
+       fi
+
+       msg_stopping "binfmt detector"
+       echo '-1' > ${BINFMT_DIR}/windows
+       echo '-1' > ${BINFMT_DIR}/windowsPE
+       rm -f /var/lock/subsys/binfmt-detector
+       ok
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/binfmt-detector ]; then
                msg_not_running "binfmt-detector"
+               RETVAL=$1
+               return
        fi
+
+       stop
+       start
+}
+
+RETVAL=0
+case "$1" in
+  start|reload)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-    $0 stop;
-    $0 start;
+    stop
+    start
+       ;;
+  try-restart)
+       condrestart 0
+       ;;
+  force-reload)
+       condrestart 7
        ;;
   status)
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|try-restart|force-reload|status}"
        exit 3
 esac
 
-exit 0
+exit $RETVAL