Divert /etc/conserver/console.cf in the right binary package.

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

diff --git a/debian/invirt-console-server.init b/debian/invirt-console-server.init
index 17e44bb..1d083a3 100755 (executable)
--- a/debian/invirt-console-server.init
+++ b/debian/invirt-console-server.init
@@ -22,30 +22,16 @@ MOUNTPOINT="/consolefs"
 DAEMON_ARGS="-f $MOUNTPOINT"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 DAEMON_ARGS="-f $MOUNTPOINT"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME

+GEN_FILES=(/etc/conserver/invirt-hosts.cf
+    /etc/remctl/acl/invirt-console-server
+    /etc/issue.net.no_tkt
+    /etc/nss-pgsql.conf)

 
 # 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
-
-gen_config()
-{
-    for i in /etc/conserver/invirt-hosts.cf \
-             /etc/remctl/acl/invirt-console-server \
-             /etc/issue.net.no_tkt \
-             /etc/nss-pgsql.conf \
-             ; do
-        mako-render $i.mako > $i
-    done
-}
+. /lib/init/gen-files.sh
+. /lib/init/std-init.sh

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

@@ -64,7 +50,7 @@ do_start()
         return 1
     fi
     
         return 1
     fi
     

-    gen_config
+    gen_files

     
     daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
 }
     
     daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2
 }

@@ -93,54 +79,8 @@ do_stop()
 
 do_reload()
 {
 
 do_reload()
 {

-    gen_config
+    gen_files

     invoke-rc.d conserver-server 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"