From 28710237c927289d59a043452f15438690e1f6f9 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Fri, 24 Oct 2008 01:44:16 -0400
Subject: [PATCH] sipb-xen-console-server -> invirt-console-host

svn path=/trunk/packages/invirt-console-host/; revision=1187
---
 debian/changelog                                   |    7 +++++++
 debian/control                                     |    6 +++---
 debian/control.in                                  |    6 +++---
 debian/copyright                                   |    2 +-
 debian/invirt-console-host.cron.d                  |    8 ++++++++
 ...onsole-server.init => invirt-console-host.init} |    4 ++--
 ...-server.install => invirt-console-host.install} |    0
 ...erver.postinst => invirt-console-host.postinst} |    6 +++---
 ...sole-server.prerm => invirt-console-host.prerm} |    4 ++--
 debian/rules                                       |    8 ++++----
 debian/sipb-xen-console-server.cron.d              |    8 --------
 .../{conserver.cf.sipb-xen => conserver.cf.invirt} |    2 +-
 .../{sipb-xen-consoles.cf => invirt-consoles.cf}   |    0
 .../{server.conf.sipb-xen => server.conf.invirt}   |    0
 ...en-update-conserver => invirt-update-conserver} |    2 +-
 15 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 debian/invirt-console-host.cron.d
 rename debian/{sipb-xen-console-server.init => invirt-console-host.init} (96%)
 rename debian/{sipb-xen-console-server.install => invirt-console-host.install} (100%)
 rename debian/{sipb-xen-console-server.postinst => invirt-console-host.postinst} (90%)
 rename debian/{sipb-xen-console-server.prerm => invirt-console-host.prerm} (82%)
 delete mode 100644 debian/sipb-xen-console-server.cron.d
 rename files/etc/conserver/{conserver.cf.sipb-xen => conserver.cf.invirt} (91%)
 rename files/etc/conserver/{sipb-xen-consoles.cf => invirt-consoles.cf} (100%)
 rename files/etc/conserver/{server.conf.sipb-xen => server.conf.invirt} (100%)
 rename files/usr/sbin/{sipb-xen-update-conserver => invirt-update-conserver} (94%)

diff --git a/debian/changelog b/debian/changelog
index b1eb4d5..810ec47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-console-host (0.0.1) unstable; urgency=low
+
+  * sipb-xen -> invirt
+  * -server -> -host while we're at it
+
+ -- Greg Price <price@mit.edu>  Fri, 24 Oct 2008 01:23:56 -0400
+
 sipb-xen-console-server (2.8) unstable; urgency=low
 
   * Create a dummy console entry that exists by default so that conserver
diff --git a/debian/control b/debian/control
index 05c420d..96bfef4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
-Source: sipb-xen-console-server
+Source: invirt-console-host
 Section: servers
 Priority: important
-Maintainer: sipb-xen@mit.edu
+Maintainer: invirt@mit.edu
 Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5), config-package-dev (>= 4.5~)
 Standards-Version: 3.7.2
 
-Package: sipb-xen-console-server
+Package: invirt-console-host
 Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
diff --git a/debian/control.in b/debian/control.in
index 85d1963..aad3e2b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,11 +1,11 @@
-Source: sipb-xen-console-server
+Source: invirt-console-host
 Section: servers
 Priority: important
-Maintainer: sipb-xen@mit.edu
+Maintainer: invirt@mit.edu
 Build-Depends: @cdbs@
 Standards-Version: 3.7.2
 
-Package: sipb-xen-console-server
+Package: invirt-console-host
 Architecture: all
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
diff --git a/debian/copyright b/debian/copyright
index 7789434..ea245dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,3 @@
 This package was created for internal use of the SIPB Xen Project of
-the MIT Student Information Processing Board.  Ask sipb-xen@mit.edu if
+the MIT Student Information Processing Board.  Ask invirt@mit.edu if
 you have questions about redistribution.
diff --git a/debian/invirt-console-host.cron.d b/debian/invirt-console-host.cron.d
new file mode 100644
index 0000000..2135f98
--- /dev/null
+++ b/debian/invirt-console-host.cron.d
@@ -0,0 +1,8 @@
+#
+# cron-jobs for invirt-console-host
+# Refresh the list of active VM consoles
+#
+
+MAILTO=root
+
+*/5 * * * * root python /usr/sbin/invirt-update-conserver
diff --git a/debian/sipb-xen-console-server.init b/debian/invirt-console-host.init
similarity index 96%
rename from debian/sipb-xen-console-server.init
rename to debian/invirt-console-host.init
index 2b8a116..c4d22c2 100755
--- a/debian/sipb-xen-console-server.init
+++ b/debian/invirt-console-host.init
@@ -1,6 +1,6 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          sipb-xen-console-server
+# Provides:          invirt-console-host
 # Required-Start:    $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Default-Start:     2 3 4 5
@@ -16,7 +16,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Invirt host console config"
-NAME=sipb-xen-console-server
+NAME=invirt-console-host
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Read configuration variable file if it is present
diff --git a/debian/sipb-xen-console-server.install b/debian/invirt-console-host.install
similarity index 100%
rename from debian/sipb-xen-console-server.install
rename to debian/invirt-console-host.install
diff --git a/debian/sipb-xen-console-server.postinst b/debian/invirt-console-host.postinst
similarity index 90%
rename from debian/sipb-xen-console-server.postinst
rename to debian/invirt-console-host.postinst
index 8734aff..d2c7c08 100755
--- a/debian/sipb-xen-console-server.postinst
+++ b/debian/invirt-console-host.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for sipb-xen-console-server
+# postinst script for invirt-console-host
 #
 # see: dh_installdeb(1)
 
@@ -21,9 +21,9 @@ set -e
 case "$1" in
     configure)
         cat >>/etc/sudoers <<EOF
-### BEGIN sipb-xen-console-server
+### BEGIN invirt-console-host
 conservr ALL=(ALL) NOPASSWD: /usr/sbin/xm console d_*
-### END sipb-xen-console-server
+### END invirt-console-host
 EOF
     ;;
 
diff --git a/debian/sipb-xen-console-server.prerm b/debian/invirt-console-host.prerm
similarity index 82%
rename from debian/sipb-xen-console-server.prerm
rename to debian/invirt-console-host.prerm
index 320d360..9d0b178 100755
--- a/debian/sipb-xen-console-server.prerm
+++ b/debian/invirt-console-host.prerm
@@ -1,5 +1,5 @@
 #!/bin/sh
-# prerm script for sipb-xen-console-server
+# prerm script for invirt-console-host
 #
 # see: dh_installdeb(1)
 
@@ -19,7 +19,7 @@ set -e
 
 case "$1" in
     remove|upgrade|deconfigure)
-        perl -i.bak -ne 's%^### (BEGIN|END) sipb-xen-console-server\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+        perl -i.bak -ne 's%^### (BEGIN|END) invirt-console-host\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
     ;;
 
     failed-upgrade)
diff --git a/debian/rules b/debian/rules
index ed4de00..a65df28 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEB_DIVERT_EXTENSION = .sipb-xen
-DEB_DIVERT_FILES_sipb-xen-console-server += \
-	/etc/conserver/conserver.cf.sipb-xen \
-	/etc/conserver/server.conf.sipb-xen
+DEB_DIVERT_EXTENSION = .invirt
+DEB_DIVERT_FILES_invirt-console-host += \
+	/etc/conserver/conserver.cf.invirt \
+	/etc/conserver/server.conf.invirt
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/config-package.mk
diff --git a/debian/sipb-xen-console-server.cron.d b/debian/sipb-xen-console-server.cron.d
deleted file mode 100644
index 1af2beb..0000000
--- a/debian/sipb-xen-console-server.cron.d
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# cron-jobs for sipb-xen-console-server
-# Refresh the list of active VM consoles
-#
-
-MAILTO=root
-
-*/5 * * * * root python /usr/sbin/sipb-xen-update-conserver
diff --git a/files/etc/conserver/conserver.cf.sipb-xen b/files/etc/conserver/conserver.cf.invirt
similarity index 91%
rename from files/etc/conserver/conserver.cf.sipb-xen
rename to files/etc/conserver/conserver.cf.invirt
index a1f6403..1b92380 100644
--- a/files/etc/conserver/conserver.cf.sipb-xen
+++ b/files/etc/conserver/conserver.cf.invirt
@@ -22,4 +22,4 @@ default * {
 }
 
 #include /etc/conserver/invirt-genconfig.cf
-#include /etc/conserver/sipb-xen-consoles.cf
+#include /etc/conserver/invirt-consoles.cf
diff --git a/files/etc/conserver/sipb-xen-consoles.cf b/files/etc/conserver/invirt-consoles.cf
similarity index 100%
rename from files/etc/conserver/sipb-xen-consoles.cf
rename to files/etc/conserver/invirt-consoles.cf
diff --git a/files/etc/conserver/server.conf.sipb-xen b/files/etc/conserver/server.conf.invirt
similarity index 100%
rename from files/etc/conserver/server.conf.sipb-xen
rename to files/etc/conserver/server.conf.invirt
diff --git a/files/usr/sbin/sipb-xen-update-conserver b/files/usr/sbin/invirt-update-conserver
similarity index 94%
rename from files/usr/sbin/sipb-xen-update-conserver
rename to files/usr/sbin/invirt-update-conserver
index 8d99d64..f657c08 100755
--- a/files/usr/sbin/sipb-xen-update-conserver
+++ b/files/usr/sbin/invirt-update-conserver
@@ -25,7 +25,7 @@ if __name__ == '__main__':
     principal = 'host/'+hostname+'@'+realm
     conftext = '\n'.join('console %s { master %s; }' % (vm, hostname)
                          for vm in live_vms())
-    f = open('/etc/conserver/sipb-xen-consoles.cf', 'w')
+    f = open('/etc/conserver/invirt-consoles.cf', 'w')
     f.write(conftext)
     f.close()
     reload_conserver()
-- 
1.7.9.5