From: Greg Price <price@mit.edu>
Date: Thu, 6 Nov 2008 01:00:52 +0000 (-0500)
Subject: shorten invirt-remote-server initscript with std-init, correct the usage message
X-Git-Tag: invirt-remote-server/0.0.13~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-remote.git/commitdiff_plain/cb6e4d01739d737ad3be000234acf362bd944abb?ds=sidebyside

shorten invirt-remote-server initscript with std-init, correct the usage message

svn path=/trunk/packages/invirt-remote-server/; revision=1534
---

diff --git a/debian/changelog b/debian/changelog
index c1d2208..75120de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-remote-server (0.0.12) unstable; urgency=low
+
+  * shorten initscript with std-init, correct the usage message
+
+ -- Greg Price <price@mit.edu>  Wed, 5 Nov 2008 19:59:18 -0400
+
 invirt-remote-server (0.0.11) unstable; urgency=low
 
   * Don't proxy requests for the VNC cert if the requested hostname isn't
diff --git a/debian/invirt-remote-server.init b/debian/invirt-remote-server.init
index 605abc6..f72f00d 100755
--- a/debian/invirt-remote-server.init
+++ b/debian/invirt-remote-server.init
@@ -11,55 +11,33 @@
 
 # Author: Invirt project <invirt@mit.edu>
 
-# Do NOT "set -e"
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=invirt-remote-server
 DESC="the Invirt remctl configuration filesystem"
-NAME=invirt-remconffs
 DAEMON=/usr/sbin/invirt-remconffs
 DAEMON_ARGS="/etc/remctl/remconffs"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
+GEN_FILES=/etc/remctl/acl/web
 
 # 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
+. /lib/init/gen-files.sh
+. /lib/init/std-init.sh
 
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-gen_config()
-{
-	for i in /etc/remctl/acl/web; do
-		mako-render $i.mako > $i
-	done
-}
-
-#
-# Function that starts the daemon/service
-#
 do_start()
 {
 	# Return
 	#   0 if daemon has been started
 	#   1 if daemon was already running
 	#   2 if daemon could not be started
-	gen_config
+	gen_files
 	modprobe fuse
 	daemon --running -n $NAME && return 1
 	daemon -r -O daemon.info -E daemon.err -n $NAME -U $DAEMON $DAEMON_ARGS || return 2
 }
 
-#
-# Function that stops the daemon/service
-#
 do_stop()
 {
 	# Return
@@ -76,59 +54,4 @@ do_stop()
 	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"