Switch to using std-init in invirt-console-server

svn path=/trunk/packages/invirt-console-server/; revision=1742

diff --git a/debian/changelog b/debian/changelog
index dec5b18..58c6ef9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 invirt-console-server (0.1.1) unstable; urgency=low
 
   * Clean up the init script with some ideas from debathena-pyhesiodfs.
+  * Switch to using std-init.
 
- -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:25:54 -0500
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:26:22 -0500
 
 invirt-console-server (0.1.0) unstable; urgency=low
 

diff --git a/debian/invirt-console-server.init b/debian/invirt-console-server.init
index 17e44bb..f347622 100755 (executable)
--- a/debian/invirt-console-server.init
+++ b/debian/invirt-console-server.init
@@ -26,15 +26,7 @@ SCRIPTNAME=/etc/init.d/$NAME
 # 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
 
 gen_config()
 {
@@ -97,50 +89,4 @@ do_reload()
     invoke-rc.d conserver-server reload
 }
 
-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)
-    log_daemon_msg "Reloading $DESC" "$NAME"
-    do_reload
-    log_end_msg $?
-    ;;
-  restart)
-    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
-    exit 3
-    ;;
-esac
-
-:
+std_init "$1"