From: Evan Broder Date: Sat, 22 Nov 2008 10:45:43 +0000 (-0500) Subject: Use gen-files.sh in invirt-console-server instead of rolling our own X-Git-Tag: invirt-console-server/0.1.2^0 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/db90cbf66302a1eedb81784da3acdf7ea1ff07fd 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 --- 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 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. diff --git a/debian/invirt-console-server.init b/debian/invirt-console-server.init index f347622..b5482e0 100755 --- 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 +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 +. /lib/init/gen-files.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 # @@ -56,7 +50,7 @@ do_start() return 1 fi - gen_config + gen_files daemon -r -O daemon.info -E daemon.err -n $NAME -- $DAEMON $DAEMON_ARGS || return 2 }