Cleanup invirt-vnc-server's init script to use /lib/init/std-init.sh

[invirt/packages/invirt-vnc-server.git] / debian / invirt-vnc-server.init

diff --git a/debian/invirt-vnc-server.init b/debian/invirt-vnc-server.init
index 67fbe89..a096c57 100644 (file)
--- a/debian/invirt-vnc-server.init
+++ b/debian/invirt-vnc-server.init
@@ -14,9 +14,8 @@
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script

-PATH=/sbin:/usr/sbin:/bin:/usr/bin
+PACKAGE=invirt-vnc-server

 DESC="The Invirt VNC Proxy Server"
 DESC="The Invirt VNC Proxy Server"

-NAME=invirt-vnc-server

 DAEMON=/usr/sbin/invirt-vnc-server
 DAEMON_ARGS=""
 PIDFILE=/var/run/$NAME.pid
 DAEMON=/usr/sbin/invirt-vnc-server
 DAEMON_ARGS=""
 PIDFILE=/var/run/$NAME.pid

@@ -25,15 +24,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 

-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
+. /lib/init/std-init.sh

 
 #
 # Function that starts the daemon/service
 
 #
 # Function that starts the daemon/service

@@ -45,7 +36,7 @@ do_start()
        #   1 if daemon was already running
        #   2 if daemon could not be started
        daemon --running -n $NAME && return 1
        #   1 if daemon was already running
        #   2 if daemon could not be started
        daemon --running -n $NAME && return 1

-       daemon -r -U -D "$(dirname $DAEMON)" -O daemon.info -E daemon.err -n $NAME -U $DAEMON $DAEMON_ARGS || return 2
+       daemon -r -U -O daemon.info -E daemon.err -n $NAME -U $DAEMON $DAEMON_ARGS || return 2

 }
 
 #
 }
 
 #

@@ -66,59 +57,4 @@ do_stop()
        return "$RETVAL"
 }
 
        return "$RETVAL"
 }
 

-case "$1" in
-  start)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-       do_start
-       case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
-       ;;
-  stop)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-       do_stop
-       case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
-       ;;
-  #reload|force-reload)
-       #
-       # If do_reload() is not implemented then leave this commented out
-       # and leave 'force-reload' as an alias for 'restart'.
-       #
-       #log_daemon_msg "Reloading $DESC" "$NAME"
-       #do_reload
-       #log_end_msg $?
-       #;;
-  restart|force-reload)
-       #
-       # If the "reload" option is implemented then remove the
-       # 'force-reload' alias
-       #
-       log_daemon_msg "Restarting $DESC" "$NAME"
-       do_stop
-       case "$?" in
-         0|1)
-               do_start
-               case "$?" in
-                       0) log_end_msg 0 ;;
-                       1) log_end_msg 1 ;; # Old process is still running
-                       *) log_end_msg 1 ;; # Failed to start
-               esac
-               ;;
-         *)
-               # Failed to stop
-               log_end_msg 1
-               ;;
-       esac
-       ;;
-  *)
-       #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-       echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
-       exit 3
-       ;;
-esac
-
-:
+std_init "$1"