From 227cb65ae3d4b0fd6636700595df6f00b18d4f37 Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Fri, 24 Oct 2008 00:00:00 -0400
Subject: [PATCH] sipb-xen -> invirt for remote-server
svn path=/trunk/packages/invirt-remote-server/; revision=1176
---
debian/changelog | 6 ++++++
debian/control | 6 +++---
debian/control.in | 8 ++++----
...emote-server.init => invirt-remote-server.init} | 12 ++++++------
...server.install => invirt-remote-server.install} | 0
debian/rules | 4 ++--
files/etc/remctl/conf.d/sipb-xen-web | 16 ++++++++--------
.../sbin/{sipb-xen-remconffs => invirt-remconffs} | 4 ++--
.../{sipb-xen-remctl-help => invirt-remctl-help} | 0
...pb-xen-remote-control => invirt-remote-control} | 6 +++---
...sipb-xen-remote-create => invirt-remote-create} | 6 +++---
...-xen-remote-listhost => invirt-remote-listhost} | 6 +++---
...pb-xen-remote-listvms => invirt-remote-listvms} | 0
...-xen-remote-listvmsd => invirt-remote-listvmsd} | 0
.../{sipb-xen-remote-proxy => invirt-remote-proxy} | 10 +++++-----
files/usr/sbin/invirt-remote-proxy-control | 1 +
files/usr/sbin/invirt-remote-proxy-web | 1 +
files/usr/sbin/sipb-xen-remote-proxy-control | 1 -
files/usr/sbin/sipb-xen-remote-proxy-web | 1 -
19 files changed, 47 insertions(+), 41 deletions(-)
rename debian/{sipb-xen-remote-server.init => invirt-remote-server.init} (91%)
rename debian/{sipb-xen-remote-server.install => invirt-remote-server.install} (100%)
rename files/usr/sbin/{sipb-xen-remconffs => invirt-remconffs} (94%)
rename files/usr/sbin/{sipb-xen-remctl-help => invirt-remctl-help} (100%)
rename files/usr/sbin/{sipb-xen-remote-control => invirt-remote-control} (82%)
rename files/usr/sbin/{sipb-xen-remote-create => invirt-remote-create} (87%)
rename files/usr/sbin/{sipb-xen-remote-listhost => invirt-remote-listhost} (73%)
rename files/usr/sbin/{sipb-xen-remote-listvms => invirt-remote-listvms} (100%)
rename files/usr/sbin/{sipb-xen-remote-listvmsd => invirt-remote-listvmsd} (100%)
rename files/usr/sbin/{sipb-xen-remote-proxy => invirt-remote-proxy} (63%)
create mode 120000 files/usr/sbin/invirt-remote-proxy-control
create mode 120000 files/usr/sbin/invirt-remote-proxy-web
delete mode 120000 files/usr/sbin/sipb-xen-remote-proxy-control
delete mode 120000 files/usr/sbin/sipb-xen-remote-proxy-web
diff --git a/debian/changelog b/debian/changelog
index fad2818..47103a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-remote-server (0.0.1) unstable; urgency=low
+
+ * sipb-xen -> invirt
+
+ -- Greg Price <price@mit.edu> Thu, 23 Oct 2008 23:58:36 -0400
+
sipb-xen-remote-server (0.10.2) unstable; urgency=low
* There's a race condition for if the VM gets powered off between the
diff --git a/debian/control b/debian/control
index e3fe70c..e574763 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
-Source: sipb-xen-remote-server
+Source: invirt-remote-server
Section: servers
Priority: important
-Maintainer: sipb-xen@mit.edu
+Maintainer: invirt@mit.edu
Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 5)
Standards-Version: 3.7.2
-Package: sipb-xen-remote-server
+Package: invirt-remote-server
Architecture: all
Provides: ${diverted-files}
Conflicts: ${diverted-files}
diff --git a/debian/control.in b/debian/control.in
index de22c2c..3816797 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -1,14 +1,14 @@
-Source: sipb-xen-remote-server
+Source: invirt-remote-server
Section: servers
Priority: important
-Maintainer: sipb-xen@mit.edu
+Maintainer: invirt@mit.edu
Build-Depends: @cdbs@
Standards-Version: 3.7.2
-Package: sipb-xen-remote-server
+Package: invirt-remote-server
Architecture: all
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Depends: ${shlibs:Depends}, ${misc:Depends}, daemon, debathena-kerberos-config, fuse-utils, openssh-server, python-routefs, sipb-xen-chrony-config, sipb-xen-database-common, sipb-xen-base, remctl-server, remctl-client
-Description: SIPB Xen remote-control server
+Description: Invirt remote-control server
This package should be installed to set up the remote-control server.
diff --git a/debian/sipb-xen-remote-server.init b/debian/invirt-remote-server.init
similarity index 91%
rename from debian/sipb-xen-remote-server.init
rename to debian/invirt-remote-server.init
index cdc27a8..0af248c 100755
--- a/debian/sipb-xen-remote-server.init
+++ b/debian/invirt-remote-server.init
@@ -1,23 +1,23 @@
#! /bin/sh
### BEGIN INIT INFO
-# Provides: sipb-xen-remote-server
+# Provides: invirt-remote-server
# Required-Start: $local_fs $remote_fs
# Required-Stop: $local_fs $remote_fs
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
-# Short-Description: sipb-xen remctl configuration filesystem
+# Short-Description: Invirt remctl configuration filesystem
# Description:
### END INIT INFO
-# Author: SIPB Xen Project <sipb-xen@mit.edu>
+# Author: SIPB Invirt Project <invirt@mit.edu>
# Do NOT "set -e"
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="The sipb-xen remctl configuration filesystem"
-NAME=sipb-xen-remconffs
-DAEMON=/usr/sbin/sipb-xen-remconffs
+DESC="the Invirt remctl configuration filesystem"
+NAME=invirt-remconffs
+DAEMON=/usr/sbin/invirt-remconffs
DAEMON_ARGS="/etc/remctl/remconffs"
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
diff --git a/debian/sipb-xen-remote-server.install b/debian/invirt-remote-server.install
similarity index 100%
rename from debian/sipb-xen-remote-server.install
rename to debian/invirt-remote-server.install
diff --git a/debian/rules b/debian/rules
index 0baf8cf..e8fd697 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
-DEB_DIVERT_EXTENSION = .sipb-xen
-#DEB_DIVERT_FILES_sipb-xen-remote-server += \
+DEB_DIVERT_EXTENSION = .invirt
+#DEB_DIVERT_FILES_invirt-remote-server += \
# /etc/init.d/bootmisc.sh \
# /etc/nscd.conf \
# /etc/nsswitch.conf \
diff --git a/files/etc/remctl/conf.d/sipb-xen-web b/files/etc/remctl/conf.d/sipb-xen-web
index 53ba88f..c812c8f 100644
--- a/files/etc/remctl/conf.d/sipb-xen-web
+++ b/files/etc/remctl/conf.d/sipb-xen-web
@@ -1,9 +1,9 @@
-web lvcreate /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
-web lvremove /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
-web lvrename /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
-web lvresize /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
-web lvcopy /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
-web listvms /usr/sbin/sipb-xen-remote-proxy-web /etc/remctl/acl/web
+web lvcreate /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
+web lvremove /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
+web lvrename /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
+web lvresize /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
+web lvcopy /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
+web listvms /usr/sbin/invirt-remote-proxy-web /etc/remctl/acl/web
test sleep /usr/bin/env /etc/remctl/acl/web
-control help /usr/sbin/sipb-xen-remctl-help ANYUSER
-help ALL /usr/sbin/sipb-xen-remctl-help ANYUSER
+control help /usr/sbin/invirt-remctl-help ANYUSER
+help ALL /usr/sbin/invirt-remctl-help ANYUSER
diff --git a/files/usr/sbin/sipb-xen-remconffs b/files/usr/sbin/invirt-remconffs
similarity index 94%
rename from files/usr/sbin/sipb-xen-remconffs
rename to files/usr/sbin/invirt-remconffs
index 275ba88..384c791 100755
--- a/files/usr/sbin/sipb-xen-remconffs
+++ b/files/usr/sbin/invirt-remconffs
@@ -30,7 +30,7 @@ class RemConfFS(routefs.RouteFS):
self.lasttime = time()
self.fuse_args.add("allow_other", True)
- openlog('sipb-xen-remconffs ', LOG_PID, LOG_DAEMON)
+ openlog('invirt-remconffs ', LOG_PID, LOG_DAEMON)
syslog(LOG_DEBUG, 'Init complete.')
@@ -57,7 +57,7 @@ class RemConfFS(routefs.RouteFS):
def getconf(self, **kw):
"""Build the master conf file, with all machines
"""
- return '\n'.join("control %s /usr/sbin/sipb-xen-remote-proxy-control"
+ return '\n'.join("control %s /usr/sbin/invirt-remote-proxy-control"
" /etc/remctl/remconffs/acl/%s"
% (machine_name, machine_name)
for machine_name in self.getmachines())+'\n'
diff --git a/files/usr/sbin/sipb-xen-remctl-help b/files/usr/sbin/invirt-remctl-help
similarity index 100%
rename from files/usr/sbin/sipb-xen-remctl-help
rename to files/usr/sbin/invirt-remctl-help
diff --git a/files/usr/sbin/sipb-xen-remote-control b/files/usr/sbin/invirt-remote-control
similarity index 82%
rename from files/usr/sbin/sipb-xen-remote-control
rename to files/usr/sbin/invirt-remote-control
index 6d30d71..b205760 100755
--- a/files/usr/sbin/sipb-xen-remote-control
+++ b/files/usr/sbin/invirt-remote-control
@@ -9,16 +9,16 @@ import yaml
def main(argv):
if len(argv) < 3:
- print >>sys.stderr, "usage: sipb-xen-remote-control <machine> <command>"
+ print >>sys.stderr, "usage: invirt-remote-control <machine> <command>"
return 2
machine_name = argv[1]
command = argv[2]
- p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
+ p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
output = p.communicate()[0]
if p.returncode != 0:
raise RuntimeError("Command '%s' returned non-zero exit status %d"
- % ('sipb-xen-remote-proxy-web', p.returncode))
+ % ('invirt-remote-proxy-web', p.returncode))
vms = yaml.load(output, yaml.CSafeLoader)
if machine_name not in vms:
diff --git a/files/usr/sbin/sipb-xen-remote-create b/files/usr/sbin/invirt-remote-create
similarity index 87%
rename from files/usr/sbin/sipb-xen-remote-create
rename to files/usr/sbin/invirt-remote-create
index f957a59..db1b676 100755
--- a/files/usr/sbin/sipb-xen-remote-create
+++ b/files/usr/sbin/invirt-remote-create
@@ -21,7 +21,7 @@ def choose_host():
def main(argv):
if len(argv) < 3:
- print >> sys.stderr, "usage: sipb-xen-remote-create <operation> <machine> [<other args...>]"
+ print >> sys.stderr, "usage: invirt-remote-create <operation> <machine> [<other args...>]"
return 2
operation = argv[1]
machine_name = argv[2]
@@ -37,11 +37,11 @@ def main(argv):
print >> sys.stderr, "Arguments to the autoinstaller cannot contain spaces"
return 1
- p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
+ p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
output = p.communicate()[0]
if p.returncode != 0:
raise RuntimeError("Command '%s' returned non-zero exit status %d"
- % ('sipb-xen-remote-proxy-web', p.returncode))
+ % ('invirt-remote-proxy-web', p.returncode))
vms = yaml.load(output, yaml.CSafeLoader)
if machine_name in vms:
diff --git a/files/usr/sbin/sipb-xen-remote-listhost b/files/usr/sbin/invirt-remote-listhost
similarity index 73%
rename from files/usr/sbin/sipb-xen-remote-listhost
rename to files/usr/sbin/invirt-remote-listhost
index fa3d43b..64f6edf 100755
--- a/files/usr/sbin/sipb-xen-remote-listhost
+++ b/files/usr/sbin/invirt-remote-listhost
@@ -9,15 +9,15 @@ import yaml
def main(argv):
if len(argv) < 2:
- print >>sys.stderr, "usage: sipb-xen-remote-listhost <machine>"
+ print >>sys.stderr, "usage: invirt-remote-listhost <machine>"
return 2
machine_name = argv[1]
- p = Popen(['/usr/sbin/sipb-xen-remote-proxy-web', 'listvms'], stdout=PIPE)
+ p = Popen(['/usr/sbin/invirt-remote-proxy-web', 'listvms'], stdout=PIPE)
output = p.communicate()[0]
if p.returncode != 0:
raise RuntimeError("Command '%s' returned non-zero exit status %d"
- % ('sipb-xen-remote-proxy-web', p.returncode))
+ % ('invirt-remote-proxy-web', p.returncode))
vms = yaml.load(output, yaml.CSafeLoader)
if machine_name not in vms:
diff --git a/files/usr/sbin/sipb-xen-remote-listvms b/files/usr/sbin/invirt-remote-listvms
similarity index 100%
rename from files/usr/sbin/sipb-xen-remote-listvms
rename to files/usr/sbin/invirt-remote-listvms
diff --git a/files/usr/sbin/sipb-xen-remote-listvmsd b/files/usr/sbin/invirt-remote-listvmsd
similarity index 100%
rename from files/usr/sbin/sipb-xen-remote-listvmsd
rename to files/usr/sbin/invirt-remote-listvmsd
diff --git a/files/usr/sbin/sipb-xen-remote-proxy b/files/usr/sbin/invirt-remote-proxy
similarity index 63%
rename from files/usr/sbin/sipb-xen-remote-proxy
rename to files/usr/sbin/invirt-remote-proxy
index 983d524..c4bb562 100755
--- a/files/usr/sbin/sipb-xen-remote-proxy
+++ b/files/usr/sbin/invirt-remote-proxy
@@ -1,5 +1,5 @@
#!/bin/bash
-# invoke as sipb-xen-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
+# invoke as invirt-remote-proxy-$TYPE, with "TYPE" in the remctl sense.
klist -s || kinit -k
@@ -13,14 +13,14 @@ esac
case "$TYPE/$SERVICE" in
web/listvms )
- sipb-xen-remote-listvms "$@" ;;
+ invirt-remote-listvms "$@" ;;
control/create|control/install )
- sipb-xen-remote-create "$SERVICE" "$MACHINE" "$@" ;;
+ invirt-remote-create "$SERVICE" "$MACHINE" "$@" ;;
control/listhost|control/list-host )
- sipb-xen-remote-listhost "$MACHINE" "$@" ;;
+ invirt-remote-listhost "$MACHINE" "$@" ;;
control/* )
# Everything but create must go where the VM is already running.
- sipb-xen-remote-control "$MACHINE" "$SERVICE" "$@" ;;
+ invirt-remote-control "$MACHINE" "$SERVICE" "$@" ;;
* )
remctl "$(invirt-getconf hosts.0.hostname)" remote "$TYPE" "$SERVICE" "$@" ;;
esac
diff --git a/files/usr/sbin/invirt-remote-proxy-control b/files/usr/sbin/invirt-remote-proxy-control
new file mode 120000
index 0000000..215b1de
--- /dev/null
+++ b/files/usr/sbin/invirt-remote-proxy-control
@@ -0,0 +1 @@
+invirt-remote-proxy
\ No newline at end of file
diff --git a/files/usr/sbin/invirt-remote-proxy-web b/files/usr/sbin/invirt-remote-proxy-web
new file mode 120000
index 0000000..215b1de
--- /dev/null
+++ b/files/usr/sbin/invirt-remote-proxy-web
@@ -0,0 +1 @@
+invirt-remote-proxy
\ No newline at end of file
diff --git a/files/usr/sbin/sipb-xen-remote-proxy-control b/files/usr/sbin/sipb-xen-remote-proxy-control
deleted file mode 120000
index 10a01cb..0000000
--- a/files/usr/sbin/sipb-xen-remote-proxy-control
+++ /dev/null
@@ -1 +0,0 @@
-sipb-xen-remote-proxy
\ No newline at end of file
diff --git a/files/usr/sbin/sipb-xen-remote-proxy-web b/files/usr/sbin/sipb-xen-remote-proxy-web
deleted file mode 120000
index 10a01cb..0000000
--- a/files/usr/sbin/sipb-xen-remote-proxy-web
+++ /dev/null
@@ -1 +0,0 @@
-sipb-xen-remote-proxy
\ No newline at end of file
--
1.7.9.5