use new initscript library in invirt-console-host

svn path=/trunk/packages/invirt-console-host/; revision=1212

diff --git a/debian/changelog b/debian/changelog
index 9773e12..392fbb8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console-host (0.0.3) unstable; urgency=low
+
+  * make initscript even shorter, with code now provided by sipb-xen-base
+
+ -- Greg Price <price@mit.edu>  Fri, 24 Oct 2008 07:07:46 -0400
+
 invirt-console-host (0.0.2) unstable; urgency=low
 
   * make initscript start conserver on start/restart, not just reload

diff --git a/debian/control b/debian/control
index 96bfef4..4654839 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,6 @@ Package: invirt-console-host
 Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
-Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server, remctl-client
+Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server, remctl-client, sipb-xen-base
 Description: SIPB Xen serial console server server
   This configures the VMM for the server-side of the console server

diff --git a/debian/control.in b/debian/control.in
index aad3e2b..2c7672b 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,6 +9,6 @@ Package: invirt-console-host
 Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
-Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server, remctl-client
+Depends: ${shlibs:Depends}, ${misc:Depends}, conserver-server, remctl-client, sipb-xen-base
 Description: SIPB Xen serial console server server
   This configures the VMM for the server-side of the console server
\ No newline at end of file

diff --git a/debian/invirt-console-host.init b/debian/invirt-console-host.init
index 887bc3e..5d19df7 100755 (executable)
--- a/debian/invirt-console-host.init
+++ b/debian/invirt-console-host.init
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 ### BEGIN INIT INFO
 # Provides:          invirt-console-host
 # Required-Start:    $local_fs $remote_fs
@@ -11,30 +11,9 @@
 
 PACKAGE=invirt-console-host
 PARENTPACKAGE=conserver-server
+GEN_FILES=/etc/conserver/invirt-genconfig.cf
 
 dpkg -s "$PACKAGE" >/dev/null 2>/dev/null || exit 0
 
-. /lib/init/vars.sh
-. /lib/lsb/init-functions
-
-gen_config()
-{
-        for i in /etc/conserver/invirt-genconfig.cf
-        do mako-render $i.mako > $i
-        done
-}
-
-case "$1" in
-  start|reload|force-reload|restart)
-    log_begin_msg "Reloading config for $PACKAGE"
-    gen_config
-    log_end_msg $?
-    /etc/init.d/"$PARENTPACKAGE" "$1"
-    ;;
-  stop)
-    /etc/init.d/"$PARENTPACKAGE" "$1"
-    ;;
-  *)
-    log_success_msg "Usage: /etc/init.d/$PACKAGE {start|reload|force-reload|restart|stop}"
-    ;;
-esac
+. /lib/init/config-init.sh
+config_init $1