From f49ea039fd343632043b11177d806cba5d055312 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Fri, 24 Oct 2008 22:09:06 -0400 Subject: [PATCH 1/1] sipb-xen-remctl-auto -> invirt-remote-host svn path=/trunk/packages/invirt-remote-host/; revision=1239 --- debian/changelog | 6 ++++++ debian/control | 11 ++++++----- debian/control.in | 12 ------------ ...en-remctl-auto.init => invirt-remote-host.init} | 6 +++--- ...ctl-auto.install => invirt-remote-host.install} | 0 debian/rules | 1 - files/etc/cron.d/sipb-xen-remctl-auto | 10 ---------- files/etc/remctl/conf.d/invirt-remote-host | 2 ++ files/etc/remctl/conf.d/sipb-xen-remote | 2 -- .../usr/sbin/{sipb-xen-listvms => invirt-listvms} | 1 - files/usr/sbin/{sipb-xen-lvm => invirt-lvm} | 0 files/usr/sbin/{sipb-xen-remote => invirt-remote} | 11 +++++------ .../sbin/{sipb-xen-vmcontrol => invirt-vmcontrol} | 6 +++--- files/usr/sbin/sipb-xen-boot | 9 --------- 14 files changed, 25 insertions(+), 52 deletions(-) delete mode 100644 debian/control.in rename debian/{sipb-xen-remctl-auto.init => invirt-remote-host.init} (82%) rename debian/{sipb-xen-remctl-auto.install => invirt-remote-host.install} (100%) delete mode 100644 files/etc/cron.d/sipb-xen-remctl-auto create mode 100644 files/etc/remctl/conf.d/invirt-remote-host delete mode 100644 files/etc/remctl/conf.d/sipb-xen-remote rename files/usr/sbin/{sipb-xen-listvms => invirt-listvms} (96%) rename files/usr/sbin/{sipb-xen-lvm => invirt-lvm} (100%) rename files/usr/sbin/{sipb-xen-remote => invirt-remote} (69%) rename files/usr/sbin/{sipb-xen-vmcontrol => invirt-vmcontrol} (86%) delete mode 100755 files/usr/sbin/sipb-xen-boot diff --git a/debian/changelog b/debian/changelog index ee9e76b..bc2aee4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-remote-host (0.0.1) unstable; urgency=low + + * sipb-xen-remctl-auto -> invirt-remote-host + + -- Evan Broder Fri, 24 Oct 2008 21:54:35 -0400 + sipb-xen-remctl-auto (1.5.2) unstable; urgency=low * sipb-xen-console-server -> invirt-console-host diff --git a/debian/control b/debian/control index 4cfc17a..360f171 100644 --- a/debian/control +++ b/debian/control @@ -1,12 +1,13 @@ -Source: sipb-xen-remctl-auto +Source: invirt-remote-host Section: net Priority: extra Maintainer: SIPB Xen Project Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.2.0) -Standards-Version: 3.7.2 +Standards-Version: 3.8.0 -Package: sipb-xen-remctl-auto +Package: invirt-remote-host Architecture: all Depends: ${misc:Depends}, remctl-server, invirt-console-host, python-cjson, python-yaml -Description: Installs the SIPB Xen automatic remctl management system - This is our automatic remctl configuration management system. +Description: Installs the Invirt host remctl configuration + This is the remctl configuration for an Invirt host. It allows any + commands to be run from the Invirt remote server diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index ac979f7..0000000 --- a/debian/control.in +++ /dev/null @@ -1,12 +0,0 @@ -Source: sipb-xen-remctl-auto -Section: net -Priority: extra -Maintainer: SIPB Xen Project -Build-Depends: @cdbs@ -Standards-Version: 3.7.2 - -Package: sipb-xen-remctl-auto -Architecture: all -Depends: ${misc:Depends}, remctl-server, invirt-console-host, python-cjson, python-yaml -Description: Installs the SIPB Xen automatic remctl management system - This is our automatic remctl configuration management system. diff --git a/debian/sipb-xen-remctl-auto.init b/debian/invirt-remote-host.init similarity index 82% rename from debian/sipb-xen-remctl-auto.init rename to debian/invirt-remote-host.init index f56396d..a029ef4 100755 --- a/debian/sipb-xen-remctl-auto.init +++ b/debian/invirt-remote-host.init @@ -1,15 +1,15 @@ #!/bin/bash ### BEGIN INIT INFO -# Provides: sipb-xen-remctl-auto +# Provides: invirt-remote-host # 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: conserver config from invirt config for invirt host +# Short-Description: remctl configuration for an Invirt host # Description: ### END INIT INFO -PACKAGE=sipb-xen-remctl-auto +PACKAGE=invirt-remote-host . /lib/lsb/init-functions diff --git a/debian/sipb-xen-remctl-auto.install b/debian/invirt-remote-host.install similarity index 100% rename from debian/sipb-xen-remctl-auto.install rename to debian/invirt-remote-host.install diff --git a/debian/rules b/debian/rules index 6bf6850..e6192f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,3 @@ #!/usr/bin/make -f -DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1 include /usr/share/cdbs/1/rules/debhelper.mk diff --git a/files/etc/cron.d/sipb-xen-remctl-auto b/files/etc/cron.d/sipb-xen-remctl-auto deleted file mode 100644 index 78cc8a4..0000000 --- a/files/etc/cron.d/sipb-xen-remctl-auto +++ /dev/null @@ -1,10 +0,0 @@ -# /etc/cron.d/sipb-xen-remctl-auto: crontab entries for the sipb-xen-remctl-auto package - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -MAILTO=root -UPDATE=/usr/sbin/remctl-update.sh - -@reboot root if [ -x "$UPDATE" ]; then nice -n10 "$UPDATE" all; fi -* * * * */15 root if [ -x "$UPDATE" ]; then nice -n10 "$UPDATE" all; fi - -# EOF diff --git a/files/etc/remctl/conf.d/invirt-remote-host b/files/etc/remctl/conf.d/invirt-remote-host new file mode 100644 index 0000000..b62acac --- /dev/null +++ b/files/etc/remctl/conf.d/invirt-remote-host @@ -0,0 +1,2 @@ +remote web /usr/sbin/invirt-remote /etc/remctl/acl/remote +remote control /usr/sbin/invirt-remote /etc/remctl/acl/remote diff --git a/files/etc/remctl/conf.d/sipb-xen-remote b/files/etc/remctl/conf.d/sipb-xen-remote deleted file mode 100644 index 99e8fdf..0000000 --- a/files/etc/remctl/conf.d/sipb-xen-remote +++ /dev/null @@ -1,2 +0,0 @@ -remote web /usr/sbin/sipb-xen-remote /etc/remctl/acl/remote -remote control /usr/sbin/sipb-xen-remote /etc/remctl/acl/remote diff --git a/files/usr/sbin/sipb-xen-listvms b/files/usr/sbin/invirt-listvms similarity index 96% rename from files/usr/sbin/sipb-xen-listvms rename to files/usr/sbin/invirt-listvms index 79762fa..890931a 100755 --- a/files/usr/sbin/sipb-xen-listvms +++ b/files/usr/sbin/invirt-listvms @@ -2,7 +2,6 @@ import sys import time -sys.path.insert(0, '/usr/lib/xen-3.1-1/lib/python') from xen.lowlevel import xs xsc = xs.xs() diff --git a/files/usr/sbin/sipb-xen-lvm b/files/usr/sbin/invirt-lvm similarity index 100% rename from files/usr/sbin/sipb-xen-lvm rename to files/usr/sbin/invirt-lvm diff --git a/files/usr/sbin/sipb-xen-remote b/files/usr/sbin/invirt-remote similarity index 69% rename from files/usr/sbin/sipb-xen-remote rename to files/usr/sbin/invirt-remote index a6d1c02..b768f94 100755 --- a/files/usr/sbin/sipb-xen-remote +++ b/files/usr/sbin/invirt-remote @@ -1,5 +1,5 @@ #!/bin/sh -# sipb-xen-remote TYPE SERVICE [ARGS...] +# invirt-remote TYPE SERVICE [ARGS...] # # We carry out the remctl command proxied to us by the remote-control server. @@ -10,18 +10,18 @@ shift; shift; case "$TYPE" in control) # $SERVICE is hostname - COMMAND=/usr/sbin/sipb-xen-vmcontrol + COMMAND=/usr/sbin/invirt-vmcontrol ;; web) case "$SERVICE" in lvcreate|lvremove|lvrename|lvresize) - COMMAND=/usr/sbin/sipb-xen-lvm + COMMAND=/usr/sbin/invirt-lvm ;; vmboot) - COMMAND=/usr/sbin/sipb-xen-vmcontrol + COMMAND=/usr/sbin/invirt-vmcontrol ;; listvms) - COMMAND=/usr/sbin/sipb-xen-listvms + COMMAND=/usr/sbin/invirt-listvms ;; info) COMMAND=/usr/sbin/xm @@ -38,5 +38,4 @@ case "$TYPE" in ;; esac -#echo $COMMAND "$SERVICE" "$@" $COMMAND "$SERVICE" "$@" diff --git a/files/usr/sbin/sipb-xen-vmcontrol b/files/usr/sbin/invirt-vmcontrol similarity index 86% rename from files/usr/sbin/sipb-xen-vmcontrol rename to files/usr/sbin/invirt-vmcontrol index 0c20109..b5c1d9c 100755 --- a/files/usr/sbin/sipb-xen-vmcontrol +++ b/files/usr/sbin/invirt-vmcontrol @@ -1,5 +1,5 @@ #!/bin/bash -# sipb-xen-vmcontrol MACHINE ACTION +# invirt-vmcontrol MACHINE ACTION # # remctl should have already verified that the user is authorized to # control the machine. So, we just need to execute the action requested. @@ -19,7 +19,7 @@ case "$ACTION" in ;; destroy|shutdown) xm "$ACTION" "$MACHINE" - /usr/sbin/sipb-xen-update-conserver /dev/null 2>&1 & + /usr/sbin/invirt-update-conserver /dev/null 2>&1 & ;; install|create|reboot) shift; shift; @@ -35,7 +35,7 @@ case "$ACTION" in else xm create sipb-database machine_name="$ORIGMACHINE" fi - (sleep 4; /usr/sbin/sipb-xen-update-conserver) /dev/null 2>&1 & + (sleep 4; /usr/sbin/invirt-update-conserver) /dev/null 2>&1 & ;; list-long) xm list --long "$MACHINE" diff --git a/files/usr/sbin/sipb-xen-boot b/files/usr/sbin/sipb-xen-boot deleted file mode 100755 index 7a9cb81..0000000 --- a/files/usr/sbin/sipb-xen-boot +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -machine="$2" -cdrom="$3" - -if [ -n "$cdrom" ]; then - xm create sipb-database machine_name="$machine" cdrom_image="$cdrom" -else - xm create sipb-database machine_name="$machine" -fi -- 1.7.9.5