Use gen-files.sh in invirt-console-server instead of rolling our own

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

diff --git a/debian/changelog b/debian/changelog
index 58c6ef9..d737d23 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console-server (0.1.2) unstable; urgency=low
+
+  * Use gen-files.sh instead of rolling out own
+
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:45:25 -0500
+

 invirt-console-server (0.1.1) unstable; urgency=low
 
   * Clean up the init script with some ideas from debathena-pyhesiodfs.
 invirt-console-server (0.1.1) unstable; urgency=low
 
   * Clean up the init script with some ideas from debathena-pyhesiodfs.

diff --git a/debian/invirt-console-server.init b/debian/invirt-console-server.init
index f347622..b5482e0 100755 (executable)
--- a/debian/invirt-console-server.init
+++ b/debian/invirt-console-server.init
@@ -22,23 +22,17 @@ 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
 

+. /lib/init/gen-files.sh

 . /lib/init/std-init.sh
 
 . /lib/init/std-init.sh
 

-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
-}
-

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

@@ -56,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
 }