From: Evan Broder <broder@mit.edu>
Date: Fri, 31 Oct 2008 10:34:19 +0000 (-0400)
Subject: Use invoke-rc.d instead of calling init scripts directly in
X-Git-Tag: invirt-console-server/0.0.6^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/e73df4f67a075bd8f2fbbf70786200ee548bad56

Use invoke-rc.d instead of calling init scripts directly in
invirt-console-server init script and invirt-console-update

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

diff --git a/debian/changelog b/debian/changelog
index 62aa79f..310d845 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console-server (0.0.6) unstable; urgency=low
+
+  * Use invoke-rc.d instead of calling init scripts directly
+
+ -- Evan Broder <broder@mit.edu>  Fri, 31 Oct 2008 06:32:17 -0400
+
 invirt-console-server (0.0.5) unstable; urgency=low
 
   * sipb-xen-base -> invirt-base
diff --git a/debian/invirt-console-server.init b/debian/invirt-console-server.init
index cfd9214..1ed7309 100755
--- a/debian/invirt-console-server.init
+++ b/debian/invirt-console-server.init
@@ -83,7 +83,7 @@ do_stop()
 do_reload()
 {
 	gen_config
-	/etc/init.d/conserver-server reload
+	invoke-rc.d conserver-server reload
 }
 
 case "$1" in
diff --git a/files/usr/sbin/invirt-console-update b/files/usr/sbin/invirt-console-update
index d5035e6..a6716d7 100755
--- a/files/usr/sbin/invirt-console-update
+++ b/files/usr/sbin/invirt-console-update
@@ -9,7 +9,7 @@ def main(args):
   f = file('/etc/conserver/conf.d/'+hostname, 'w')
   f.write(contents)
   f.close()
-  p = subprocess.Popen(['/etc/init.d/conserver-server', 'reload'],
+  p = subprocess.Popen(['invoke-rc.d', 'conserver-server', 'reload'],
                        stdout=subprocess.PIPE)
   p.wait()
   return 0