debian/0000775000000000000000000000000012145170167007174 5ustar debian/gbp.conf0000664000000000000000000000635612045670777010640 0ustar # Configuration file for git-buildpackage and friends [DEFAULT] # the default build command: builder = debuild # the default clean command: #cleaner = debuild clean # the default branch for upstream sources: upstream-branch = upstream-sid # the default branch for the debian patch: debian-branch = debian-sid # the default tag formats used: upstream-tag = master/%(version)s debian-tag = debian/%(version)s # use pristine-tar: pristine-tar = False # don't check if debian-branch == current branch: #ignore-branch = True # Use color when on a terminal, alternatives: on/true, off/false or auto #color = auto # Options only affecting git-buildpackage [git-buildpackage] # Look for a tag matching the upstream version when creating a tarball upstream-tree = tag # uncomment this to automatically GPG sign tags: #sign-tags = True # keyid to GPG sign tags with: #keyid = 0xdeadbeef # push to a remote repository after a successful tag: #posttag = git-push git.example.com # call lintian after a successful build: #postbuild = lintian $GBP_CHANGES_FILE # let package generate upstream changelog before build: #prebuild = GIT_DIR=$GBP_GIT_DIR debian/autogen.sh # use this for more svn-buildpackage like behaviour: export-dir = ../build-area/ #tarball-dir = ../tarballs/ #ignore-new = True #export = HEAD # compress with bzip2 #compression = bzip2 # use best compression #compression-level = best # Don't send notifications, alternatives: on/true, off/false or auto #notify = off # Transparently handle submodules # submodules = True # Options only affecting git-import-orig [git-import-orig] # set a different upstream branch to import to: #upstream-branch = newupstream # set a different branch to merge to: #debian-branch = dfsgclean # don't merge to debian branch by default: #merge = False # import filter: #filter = .svn # filter out files from tarball passed to pristine tar: #filter-pristine-tar = True # run hook after the import: #postimport = git-dch -N%(version)s -S -a --debian-branch=$GBP_BRANCH # emulate old behaviour of calling dch: #postimport = dch -v%(version)s New Upstream Version # commit message: #import-msg = New upstream version %(version)s # Options only affecting git-import-dsc [git-import-dsc] # set a different upstream branch: #upstream-branch = svn-upstream # import filter: #filter = [ 'CVS', '.cvsignore' ] #force committer to be the same as author #author-is-committer = True #same for the date #author-date-is-committer-date = True # Options only affecting git-dch [git-dch] # options passed to git-log: #git-log = --no-merges # next snapshot number: #snapshot-number = snapshot + 1 # include 7 digits of the commit id in the changelog enty: #id-length = 7 # don't include information from meta tags: #meta = False # what tags to look for to generate bug-closing changelog entries: #meta-closes = Closes|LP # include the full commit message in the changelog: #full = True # ignore Signed-off-by: lines: #ignore-regex=(Signed-off|Acked)-by: # use author name and email from git-config: #git-author = True # Options only affecting gbp-pq [gbp-pq] #patch-numbers = False # Options only affecting gbp-clone [gbp-clone] #pristine-tar = True # Options only affecting gbp- [gbp-pull] #pristine-tar = True [gbp-create-remote-repo] # disable remote branch tracking #track = False debian/patches/0000775000000000000000000000000012145170026010615 5ustar debian/patches/0002-lvm2-path.patch0000664000000000000000000000152512045670777014053 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:01 +0000 Subject: lvm2-path --- drivers/lvutil.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/lvutil.py b/drivers/lvutil.py index e9bf30a..a6c9914 100755 --- a/drivers/lvutil.py +++ b/drivers/lvutil.py @@ -31,7 +31,7 @@ import vhdutil MDVOLUME_NAME = 'MGT' VDI_UUID_TAG_PREFIX = 'vdi_' -LVM_BIN = "/usr/sbin" +LVM_BIN = "/sbin" CMD_VGS = os.path.join(LVM_BIN, "vgs") CMD_VGCREATE = os.path.join(LVM_BIN, "vgcreate") CMD_VGREMOVE = os.path.join(LVM_BIN, "vgremove") @@ -575,4 +575,4 @@ def removeDevMapperEntry(path): util.SMlog("removeDevMapperEntry: dmsetup remove failed for file %s " \ "with error %s." % (path, str(e))) return False - \ No newline at end of file + -- debian/patches/0004-remove-xencert.patch0000664000000000000000000000107712045670777015210 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:01 +0000 Subject: remove-xencert --- Makefile | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index a42b056..a1ff8c5 100644 --- a/Makefile +++ b/Makefile @@ -122,7 +122,6 @@ install: install -m 755 drivers/runvmpr $(SM_STAGING)$(SM_DEST) install -m 755 drivers/vmpr $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) ln -sf $(SM_DEST)lcache.py $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats - cp -rf XenCert $(SM_STAGING)$(DEBUG_DEST) .PHONY: clean clean: -- debian/patches/0011-fix-wrong-parameter-to-vgchange.patch0000664000000000000000000000202712045670777020335 0ustar Description: Fixes unknown --master parameter when calling vgchange In /usr/lib/xcp/sm/lvutil.py line 302 and 344, vgchange is called with the unkonwn parameter --master. This patche removes it. Author: Thomas Goirand Bug-Debian: http://bugs.debian.org/691808 Forwarded: no --- xcp-storage-managers-0.1.1.orig/drivers/lvutil.py +++ xcp-storage-managers-0.1.1/drivers/lvutil.py @@ -299,7 +299,7 @@ def createVG(root, vgname): pass raise xs_errors.XenError('LVMGroupCreate') try: - cmd = [CMD_VGCHANGE, "-an", "--master", vgname] + cmd = [CMD_VGCHANGE, "-an", vgname] util.pread2(cmd) except util.CommandException, inst: raise xs_errors.XenError('LVMUnMount', \ @@ -341,7 +341,7 @@ def setActiveVG(path, active): val = "n" if active: val = "y" - cmd = [CMD_VGCHANGE, "-a" + val, "--master", path] + cmd = [CMD_VGCHANGE, "-a" + val, path] text = util.pread2(cmd) def create(name, size, vgname, tag = None, activate = True): debian/patches/0001-install-dirs.patch0000664000000000000000000011516212045670777014650 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:00 +0000 Subject: install-dirs --- Makefile | 12 +- XenCert/StorageHandlerUtil.py | 4 +- XenCert/blockunblockhbapaths-brocade | 4 +- XenCert/blockunblockhbapaths-cisco | 4 +- XenCert/blockunblockhbapaths-qlogic | 4 +- XenCert/blockunblockiscsipaths | 4 +- XenCert/blockunblockpaths | 4 +- dcopy/Makefile | 4 +- drivers/02-vhdcleanup | 4 +- drivers/SR.py | 4 +- drivers/VASSR.py | 2 +- drivers/blktap2.py | 2 +- drivers/coalesce-leaf | 4 +- drivers/lvhd-thin | 2 +- drivers/mpath_dmp.py | 6 +- drivers/mpathcount.py | 2 +- drivers/nfs-on-slave | 2 +- drivers/on-slave | 2 +- drivers/runvmpr | 2 +- drivers/srmetadata.py | 2 +- drivers/tapdisk-pause | 2 +- drivers/updatempppathd.py | 2 +- drivers/util.py | 12 +- drivers/vmpr | 2 +- drivers/vss_control | 4 +- drivers/xs_errors.py | 2 +- etc/cron.d/vmpr | 2 +- iscsi-mgt/host/XE_ops.sh | 4 +- mk/sm.spec.in | 406 +++++++++++++++++----------------- mpathroot/mpathroot.init | 2 +- scripts/local-device-change | 4 +- snapwatchd/Makefile | 2 +- snapwatchd/snapwatchd | 4 +- snapwatchd/snapwatchd.init | 2 +- tests/XE_api_library.sh | 6 +- tests/globals.sh | 2 +- tests/lvhd_test/snapshot_stress.py | 4 +- tests/lvhd_test/storagemanager.py | 6 +- tests/lvhd_test/testsm.py | 2 +- tests/test1.sh | 6 +- tests/test_dcopy.sh | 12 +- tests/test_iscsi_refcount.sh | 2 +- tests/vmprtest | 2 +- 43 files changed, 283 insertions(+), 283 deletions(-) diff --git a/Makefile b/Makefile index 096baa2..a42b056 100644 --- a/Makefile +++ b/Makefile @@ -55,12 +55,12 @@ CRON_JOBS += ringwatch SM_XML := XE_SR_ERRORCODES -SM_DEST := /opt/xensource/sm/ -DEBUG_DEST := /opt/xensource/debug/ -BIN_DEST := /opt/xensource/bin/ -MASTER_SCRIPT_DEST := /etc/xensource/master.d/ -PLUGIN_SCRIPT_DEST := /etc/xapi.d/plugins/ -LIBEXEC := /opt/xensource/libexec/ +SM_DEST := /usr/lib/xcp/sm/ +DEBUG_DEST := /usr/lib/xcp/debug/ +BIN_DEST := /usr/lib/xcp/bin +MASTER_SCRIPT_DEST := /etc/xcp/master.d/ +PLUGIN_SCRIPT_DEST := /usr/lib/xcp/plugins/ +LIBEXEC := /usr/lib/xcp/lib/ CRON_DEST := /etc/cron.d/ SM_STAGING := $(DESTDIR) diff --git a/XenCert/StorageHandlerUtil.py b/XenCert/StorageHandlerUtil.py index 2fa27cc..5eee285 100644 --- a/XenCert/StorageHandlerUtil.py +++ b/XenCert/StorageHandlerUtil.py @@ -9,7 +9,7 @@ """Storage handler classes for various storage drivers""" import sys -sys.path.insert(0, "/opt/xensource/sm") +sys.path.insert(0, "/usr/lib/xcp/sm") import scsiutil import util import glob @@ -803,7 +803,7 @@ def get_path_status(scsi_id, onlyActive = False): return (retVal, list) def _get_localhost_uuid(): - filename = '/etc/xensource-inventory' + filename = '/etc/xcp/inventory' try: f = open(filename, 'r') except: diff --git a/XenCert/blockunblockhbapaths-brocade b/XenCert/blockunblockhbapaths-brocade index c3afafa..2a7b102 100644 --- a/XenCert/blockunblockhbapaths-brocade +++ b/XenCert/blockunblockhbapaths-brocade @@ -7,8 +7,8 @@ # by the Free Software Foundation; version 2.1 only. # import sys -sys.path.insert(0, "/opt/xensource/sm") -sys.path.insert(0, "/opt/xensource/sm/snapwatchd") +sys.path.insert(0, "/usr/lib/xcp/sm") +sys.path.insert(0, "/usr/lib/xcp/sm/snapwatchd") import util import xslib import random diff --git a/XenCert/blockunblockhbapaths-cisco b/XenCert/blockunblockhbapaths-cisco index 48a7c0a..21617ef 100644 --- a/XenCert/blockunblockhbapaths-cisco +++ b/XenCert/blockunblockhbapaths-cisco @@ -7,8 +7,8 @@ # by the Free Software Foundation; version 2.1 only. # import sys -sys.path.insert(0, "/opt/xensource/sm") -sys.path.insert(0, "/opt/xensource/sm/snapwatchd") +sys.path.insert(0, "/usr/lib/xcp/sm") +sys.path.insert(0, "/usr/lib/xcp/sm/snapwatchd") import util import xslib import random diff --git a/XenCert/blockunblockhbapaths-qlogic b/XenCert/blockunblockhbapaths-qlogic index aff63da..8bfccb4 100644 --- a/XenCert/blockunblockhbapaths-qlogic +++ b/XenCert/blockunblockhbapaths-qlogic @@ -7,8 +7,8 @@ # by the Free Software Foundation; version 2.1 only. # import sys -sys.path.insert(0, "/opt/xensource/sm") -sys.path.insert(0, "/opt/xensource/sm/snapwatchd") +sys.path.insert(0, "/usr/lib/xcp/sm") +sys.path.insert(0, "/usr/lib/xcp/sm/snapwatchd") import util import xslib import random diff --git a/XenCert/blockunblockiscsipaths b/XenCert/blockunblockiscsipaths index 150a3ae..8f11271 100644 --- a/XenCert/blockunblockiscsipaths +++ b/XenCert/blockunblockiscsipaths @@ -7,8 +7,8 @@ # by the Free Software Foundation; version 2.1 only. # import sys -sys.path.insert(0, "/opt/xensource/sm") -sys.path.insert(0, "/opt/xensource/sm/snapwatchd") +sys.path.insert(0, "/usr/lib/xcp/sm") +sys.path.insert(0, "/usr/lib/xcp/sm/snapwatchd") import util import xslib import random diff --git a/XenCert/blockunblockpaths b/XenCert/blockunblockpaths index 3293c0d..6cb35dc 100644 --- a/XenCert/blockunblockpaths +++ b/XenCert/blockunblockpaths @@ -12,8 +12,8 @@ # information, then waits until the xenstore flag is set. # or just waits till the flag is set. import sys -sys.path.insert(0, "/opt/xensource/sm") -sys.path.insert(0, "/opt/xensource/sm/snapwatchd") +sys.path.insert(0, "/usr/lib/xcp/sm") +sys.path.insert(0, "/usr/lib/xcp/sm/snapwatchd") import util import xslib import os diff --git a/dcopy/Makefile b/dcopy/Makefile index 11ac607..649796d 100644 --- a/dcopy/Makefile +++ b/dcopy/Makefile @@ -1,6 +1,6 @@ -PREFIX ?= /opt/xensource/libexec +PREFIX ?= /usr/lib/xcp/lib DESTDIR ?= -DEBUGDIR ?= /opt/xensource/debug +DEBUGDIR ?= /usr/lib/xcp/debug OPTS := -D _GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -Wall diff --git a/drivers/02-vhdcleanup b/drivers/02-vhdcleanup index 8c799ed..8a0ecf2 100644 --- a/drivers/02-vhdcleanup +++ b/drivers/02-vhdcleanup @@ -15,8 +15,8 @@ # Source function library. . /etc/init.d/functions -CLEANUP_SCRIPT="/opt/xensource/sm/cleanup.py" -LVHD_UTIL_SCRIPT="/opt/xensource/sm/lvhdutil.py" +CLEANUP_SCRIPT="/usr/lib/xcp/sm/cleanup.py" +LVHD_UTIL_SCRIPT="/usr/lib/xcp/sm/lvhdutil.py" start() { echo -n $"Fixing refcounts on new master: " diff --git a/drivers/SR.py b/drivers/SR.py index 5010862..36be3a9 100755 --- a/drivers/SR.py +++ b/drivers/SR.py @@ -448,7 +448,7 @@ class SR(object): self.mpath = "false" self.mpathhandle = "null" - if not os.path.exists("/opt/xensource/sm/mpath_%s.py" % self.mpathhandle): + if not os.path.exists("/usr/lib/xcp/sm/mpath_%s.py" % self.mpathhandle): raise except: self.mpath = "false" @@ -473,7 +473,7 @@ class SR(object): self.session.xenapi.SR.set_sm_config(self.sr_ref, sm_config) if self.mpath == "true" and len(SCSIid): - cmd = ['/opt/xensource/sm/mpathcount.py',SCSIid] + cmd = ['/usr/lib/xcp/sm/mpathcount.py',SCSIid] util.pread2(cmd) except: pass diff --git a/drivers/VASSR.py b/drivers/VASSR.py index 1a9b3a9..0daa423 100755 --- a/drivers/VASSR.py +++ b/drivers/VASSR.py @@ -68,7 +68,7 @@ # XXX import sys -sys.path = ['/opt/xensource/sm'] + sys.path +sys.path = ['/usr/lib/xcp/sm'] + sys.path import SR import VDI diff --git a/drivers/blktap2.py b/drivers/blktap2.py index a057c9e..9da74f3 100755 --- a/drivers/blktap2.py +++ b/drivers/blktap2.py @@ -34,7 +34,7 @@ import vhdutil PLUGIN_TAP_PAUSE = "tapdisk-pause" -ENABLE_MULTIPLE_ATTACH = "/etc/xensource/allow_multiple_vdi_attach" +ENABLE_MULTIPLE_ATTACH = "/etc/xcp/allow_multiple_vdi_attach" NO_MULTIPLE_ATTACH = not (os.path.exists(ENABLE_MULTIPLE_ATTACH)) def locking(excType, override=True): diff --git a/drivers/coalesce-leaf b/drivers/coalesce-leaf index 9785338..268cc34 100755 --- a/drivers/coalesce-leaf +++ b/drivers/coalesce-leaf @@ -16,8 +16,8 @@ import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") -sys.path.insert(0, "/opt/xensource/sm") +sys.path.append("/usr/lib/xcp/sm/") +sys.path.insert(0, "/usr/lib/xcp/sm") import getopt import XenAPI import cleanup diff --git a/drivers/lvhd-thin b/drivers/lvhd-thin index a404103..4546d3b 100755 --- a/drivers/lvhd-thin +++ b/drivers/lvhd-thin @@ -16,7 +16,7 @@ import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") +sys.path.append("/usr/lib/xcp/sm/") import util import vhdutil import lvhdutil diff --git a/drivers/mpath_dmp.py b/drivers/mpath_dmp.py index 9471a9d..f8c7f3e 100755 --- a/drivers/mpath_dmp.py +++ b/drivers/mpath_dmp.py @@ -29,7 +29,7 @@ import re iscsi_mpath_file = "/etc/iscsi/iscsid-mpath.conf" iscsi_default_file = "/etc/iscsi/iscsid-default.conf" iscsi_file = "/etc/iscsi/iscsid.conf" -hba_script = "/opt/xensource/sm/mpathHBA" +hba_script = "/usr/lib/xcp/sm/mpathHBA" DMPBIN = "/sbin/multipath" DEVMAPPERPATH = "/dev/mapper" @@ -40,7 +40,7 @@ SYSFS_PATH='/sys/class/scsi_host' UMPD_PATH='/var/run/updatempppathd.pid' MP_INUSEDIR = "/dev/disk/mpInuse" -MPPGETAIDLNOBIN = "/opt/xensource/bin/xe-get-arrayid-lunnum" +MPPGETAIDLNOBIN = "/usr/bin/xe-get-arrayid-lunnum" def _is_mpath_daemon_running(): cmd = ["/sbin/pidof", "-s", "/sbin/multipathd"] @@ -48,7 +48,7 @@ def _is_mpath_daemon_running(): return (rc==0) def _is_mpp_daemon_running(): - #cmd = ["/sbin/pidof", "-s", "/opt/xensource/sm/updatempppathd.py"] + #cmd = ["/sbin/pidof", "-s", "/usr/lib/xcp/sm/updatempppathd.py"] #(rc,stdout,stderr) = util.doexec(cmd) if os.path.exists(UMPD_PATH): return True diff --git a/drivers/mpathcount.py b/drivers/mpathcount.py index 49034aa..7c8d716 100755 --- a/drivers/mpathcount.py +++ b/drivers/mpathcount.py @@ -83,7 +83,7 @@ def match_host_id(s): return regex.search(s, 0) def get_localhost_uuid(): - filename = '/etc/xensource-inventory' + filename = '/etc/xcp/inventory' try: f = open(filename, 'r') except: diff --git a/drivers/nfs-on-slave b/drivers/nfs-on-slave index d7ecc00..d439dd0 100644 --- a/drivers/nfs-on-slave +++ b/drivers/nfs-on-slave @@ -12,7 +12,7 @@ # # A plugin for synchronizing slaves when something changes on the Master -import sys; sys.path.append("/opt/xensource/sm/") +import sys; sys.path.append("/usr/lib/xcp/sm/") import util import os, glob, errno, re diff --git a/drivers/on-slave b/drivers/on-slave index 390e15e..13a1a47 100755 --- a/drivers/on-slave +++ b/drivers/on-slave @@ -15,7 +15,7 @@ import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") +sys.path.append("/usr/lib/xcp/sm/") import util import lock from lvmcache import LVMCache diff --git a/drivers/runvmpr b/drivers/runvmpr index f8dcfd8..f0aa5e5 100644 --- a/drivers/runvmpr +++ b/drivers/runvmpr @@ -15,7 +15,7 @@ import util import XenAPI -POOL_CONF_FILE = "/etc/xensource/pool.conf" +POOL_CONF_FILE = "/etc/xcp/pool.conf" def Print(message): util.VMPRlog(message) diff --git a/drivers/srmetadata.py b/drivers/srmetadata.py index 175e86c..cf04614 100644 --- a/drivers/srmetadata.py +++ b/drivers/srmetadata.py @@ -17,7 +17,7 @@ import util import metadata import os import sys -sys.path.insert(0,'/opt/xensource/sm/snapwatchd') +sys.path.insert(0,'/usr/lib/xcp/sm/snapwatchd') from xslib import get_min_blk_size, open_file_for_write, open_file_for_read, \ xs_file_write, xs_file_read, close_file import xs_errors diff --git a/drivers/tapdisk-pause b/drivers/tapdisk-pause index 9317950..8657937 100755 --- a/drivers/tapdisk-pause +++ b/drivers/tapdisk-pause @@ -5,7 +5,7 @@ import os import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") +sys.path.append("/usr/lib/xcp/sm/") import blktap2, util from lock import Lock import xs_errors diff --git a/drivers/updatempppathd.py b/drivers/updatempppathd.py index d04b18e..a2ba140 100755 --- a/drivers/updatempppathd.py +++ b/drivers/updatempppathd.py @@ -97,7 +97,7 @@ def UpdatePaths(): DEBUG("Some path status has changed for SCSI ID %s, updating PBD." % scsiid) entry = "[" + str(activePaths) + ", " + str(totalPaths) + "]" DEBUG(entry) - cmd = ['/opt/xensource/sm/mpathcount.py', scsiid, entry] + cmd = ['/usr/lib/xcp/sm/mpathcount.py', scsiid, entry] util.pread2(cmd) # Now update the cache with this updated path status diff --git a/drivers/util.py b/drivers/util.py index bbd7a0b..54b99ac 100644 --- a/drivers/util.py +++ b/drivers/util.py @@ -30,8 +30,8 @@ import exceptions import traceback import glob -NO_LOGGING_STAMPFILE='/etc/xensource/no_sm_log' -ENABLE_SYSLOG_STAMPFILE='/etc/xensource/yes_sm_syslog' +NO_LOGGING_STAMPFILE='/etc/xcp/no_sm_log' +ENABLE_SYSLOG_STAMPFILE='/etc/xcp/yes_sm_syslog' IORETRY_MAX = 20 # retries IORETRY_PERIOD = 1.0 # seconds @@ -509,7 +509,7 @@ def match_rootdev(s): return regex.search(s, 0) def getrootdev(): - filename = '/etc/xensource-inventory' + filename = '/etc/xcp/inventory' try: f = open(filename, 'r') except: @@ -548,7 +548,7 @@ def get_localAPI_session(): def get_this_host(): uuid = None - f = open("/etc/xensource-inventory", 'r') + f = open("/etc/xcp/inventory", 'r') for line in f.readlines(): if line.startswith("INSTALLATION_UUID"): uuid = line.split("'")[1] @@ -557,7 +557,7 @@ def get_this_host(): # XXX: this function doesn't do what it claims to do def get_localhost_uuid(session): - filename = '/etc/xensource-inventory' + filename = '/etc/xcp/inventory' try: f = open(filename, 'r') except: @@ -967,7 +967,7 @@ def p_id_fork(): print "Fork failed: %s (%d)" % (e.strerror,e.errno) sys.exit(-1) if (p_id == 0): - os.chdir('/opt/xensource/sm') + os.chdir('/usr/lib/xcp/sm') os.umask(0) else: os._exit(0) diff --git a/drivers/vmpr b/drivers/vmpr index 39455f8..b56116a 100755 --- a/drivers/vmpr +++ b/drivers/vmpr @@ -16,7 +16,7 @@ import os import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") +sys.path.append("/usr/lib/xcp/sm/") import util import time from threading import Thread diff --git a/drivers/vss_control b/drivers/vss_control index 366e24a..494fd46 100755 --- a/drivers/vss_control +++ b/drivers/vss_control @@ -15,8 +15,8 @@ import os import sys import XenAPIPlugin -sys.path.append("/opt/xensource/sm/") -sys.path.append("/opt/xensource/sm/snapwatchd/") +sys.path.append("/usr/lib/xcp/sm/") +sys.path.append("/usr/lib/xcp/sm/snapwatchd/") import util import xslib import time diff --git a/drivers/xs_errors.py b/drivers/xs_errors.py index c0c554d..83d3909 100755 --- a/drivers/xs_errors.py +++ b/drivers/xs_errors.py @@ -19,7 +19,7 @@ import xml.dom.minidom import SR import util -XML_DEFS = '/opt/xensource/sm/XE_SR_ERRORCODES.xml' +XML_DEFS = '/usr/lib/xcp/sm/XE_SR_ERRORCODES.xml' class XenError(object): def __init__(self, key, opterr=None): # Check the XML definition file exists diff --git a/etc/cron.d/vmpr b/etc/cron.d/vmpr index 43f3fa9..2522da9 100644 --- a/etc/cron.d/vmpr +++ b/etc/cron.d/vmpr @@ -1 +1 @@ -*/15 * * * * root /opt/xensource/sm/runvmpr +*/15 * * * * root /usr/lib/xcp/sm/runvmpr diff --git a/iscsi-mgt/host/XE_ops.sh b/iscsi-mgt/host/XE_ops.sh index c32cbe5..2f21a81 100755 --- a/iscsi-mgt/host/XE_ops.sh +++ b/iscsi-mgt/host/XE_ops.sh @@ -1,12 +1,12 @@ #!/bin/sh ## global variables -. /etc/xensource-inventory +. /etc/xcp/inventory . iscsi_ctrl.sh #. iscsi_new.sh if [ -z ${CMD} ]; then - CMD="/opt/xensource/bin/xe" + CMD="/usr/bin/xe" fi LINE_LEN=40 diff --git a/mk/sm.spec.in b/mk/sm.spec.in index 3c047a8..658a0e2 100644 --- a/mk/sm.spec.in +++ b/mk/sm.spec.in @@ -34,212 +34,212 @@ rm -rf $RPM_BUILD_ROOT /etc/cron.d/* /etc/rc.d/init.d/snapwatchd /etc/rc.d/init.d/mpathroot -/etc/xapi.d/plugins/coalesce-leaf -/etc/xapi.d/plugins/lvhd-thin -/etc/xapi.d/plugins/nfs-on-slave -/etc/xapi.d/plugins/on-slave -/etc/xapi.d/plugins/tapdisk-pause -/etc/xapi.d/plugins/testing-hooks -/etc/xapi.d/plugins/vmpr -/etc/xapi.d/plugins/vss_control -/etc/xensource/master.d/02-vhdcleanup +/usr/lib/xcp/plugins/coalesce-leaf +/usr/lib/xcp/plugins/lvhd-thin +/usr/lib/xcp/plugins/nfs-on-slave +/usr/lib/xcp/plugins/on-slave +/usr/lib/xcp/plugins/tapdisk-pause +/usr/lib/xcp/plugins/testing-hooks +/usr/lib/xcp/plugins/vmpr +/usr/lib/xcp/plugins/vss_control +/etc/xcp/master.d/02-vhdcleanup /opt/xensource/bin/blktap2 /opt/xensource/bin/tapdisk-cache-stats -/opt/xensource/debug/tp -/opt/xensource/libexec/check-device-sharing -/opt/xensource/libexec/dcopy -/opt/xensource/libexec/local-device-change -/opt/xensource/sm/DummySR -/opt/xensource/sm/DummySR.py -/opt/xensource/sm/DummySR.pyc -/opt/xensource/sm/DummySR.pyo -/opt/xensource/sm/EXTSR -/opt/xensource/sm/EXTSR.py -/opt/xensource/sm/EXTSR.pyc -/opt/xensource/sm/EXTSR.pyo -/opt/xensource/sm/FileSR -/opt/xensource/sm/FileSR.py -/opt/xensource/sm/FileSR.pyc -/opt/xensource/sm/FileSR.pyo -/opt/xensource/sm/HBASR -/opt/xensource/sm/HBASR.py -/opt/xensource/sm/HBASR.pyc -/opt/xensource/sm/HBASR.pyo -/opt/xensource/sm/ISCSISR -/opt/xensource/sm/ISCSISR.py -/opt/xensource/sm/ISCSISR.pyc -/opt/xensource/sm/ISCSISR.pyo -/opt/xensource/sm/ISOSR -/opt/xensource/sm/ISOSR.py -/opt/xensource/sm/ISOSR.pyc -/opt/xensource/sm/ISOSR.pyo -/opt/xensource/sm/LUNperVDI.py -/opt/xensource/sm/LUNperVDI.pyc -/opt/xensource/sm/LUNperVDI.pyo -/opt/xensource/sm/LVHDSR.py -/opt/xensource/sm/LVHDSR.pyc -/opt/xensource/sm/LVHDSR.pyo -/opt/xensource/sm/LVHDoHBASR.py -/opt/xensource/sm/LVHDoHBASR.pyc -/opt/xensource/sm/LVHDoHBASR.pyo -/opt/xensource/sm/LVHDoISCSISR.py -/opt/xensource/sm/LVHDoISCSISR.pyc -/opt/xensource/sm/LVHDoISCSISR.pyo -/opt/xensource/sm/LVMSR -/opt/xensource/sm/LVMoHBASR -/opt/xensource/sm/LVMoISCSISR -/opt/xensource/sm/NFSSR -/opt/xensource/sm/NFSSR.py -/opt/xensource/sm/NFSSR.pyc -/opt/xensource/sm/NFSSR.pyo -/opt/xensource/sm/SHMSR.py -/opt/xensource/sm/SHMSR.pyc -/opt/xensource/sm/SHMSR.pyo -/opt/xensource/sm/SR.py -/opt/xensource/sm/SR.pyc -/opt/xensource/sm/SR.pyo -/opt/xensource/sm/SRCommand.py -/opt/xensource/sm/SRCommand.pyc -/opt/xensource/sm/SRCommand.pyo -/opt/xensource/sm/VDI.py -/opt/xensource/sm/VDI.pyc -/opt/xensource/sm/VDI.pyo -/opt/xensource/sm/XE_SR_ERRORCODES.xml -/opt/xensource/sm/blktap2.py -/opt/xensource/sm/blktap2.pyc -/opt/xensource/sm/blktap2.pyo -/opt/xensource/sm/cleanup.py -/opt/xensource/sm/cleanup.pyc -/opt/xensource/sm/cleanup.pyo -/opt/xensource/sm/devscan.py -/opt/xensource/sm/devscan.pyc -/opt/xensource/sm/devscan.pyo -/opt/xensource/sm/fjournaler.py -/opt/xensource/sm/fjournaler.pyc -/opt/xensource/sm/fjournaler.pyo -/opt/xensource/sm/flock.py -/opt/xensource/sm/flock.pyc -/opt/xensource/sm/flock.pyo -/opt/xensource/sm/ipc.py -/opt/xensource/sm/ipc.pyc -/opt/xensource/sm/ipc.pyo -/opt/xensource/sm/iscsilib.py -/opt/xensource/sm/iscsilib.pyc -/opt/xensource/sm/iscsilib.pyo -/opt/xensource/sm/journaler.py -/opt/xensource/sm/journaler.pyc -/opt/xensource/sm/journaler.pyo -/opt/xensource/sm/lcache.py -/opt/xensource/sm/lcache.pyc -/opt/xensource/sm/lcache.pyo -/opt/xensource/sm/lock.py -/opt/xensource/sm/lock.pyc -/opt/xensource/sm/lock.pyo -/opt/xensource/sm/lvhdutil.py -/opt/xensource/sm/lvhdutil.pyc -/opt/xensource/sm/lvhdutil.pyo -/opt/xensource/sm/lvmanager.py -/opt/xensource/sm/lvmanager.pyc -/opt/xensource/sm/lvmanager.pyo -/opt/xensource/sm/lvmcache.py -/opt/xensource/sm/lvmcache.pyc -/opt/xensource/sm/lvmcache.pyo -/opt/xensource/sm/lvutil.py -/opt/xensource/sm/lvutil.pyc -/opt/xensource/sm/lvutil.pyo -/opt/xensource/sm/metadata.py -/opt/xensource/sm/metadata.pyc -/opt/xensource/sm/metadata.pyo -/opt/xensource/sm/srmetadata.py -/opt/xensource/sm/srmetadata.pyc -/opt/xensource/sm/srmetadata.pyo -/opt/xensource/sm/mpathHBA -/opt/xensource/sm/mpath_cli.py -/opt/xensource/sm/mpath_cli.pyc -/opt/xensource/sm/mpath_cli.pyo -/opt/xensource/sm/mpath_dmp.py -/opt/xensource/sm/mpath_dmp.pyc -/opt/xensource/sm/mpath_dmp.pyo -/opt/xensource/sm/mpath_null.py -/opt/xensource/sm/mpath_null.pyc -/opt/xensource/sm/mpath_null.pyo -/opt/xensource/sm/mpathcount.py -/opt/xensource/sm/mpathcount.pyc -/opt/xensource/sm/mpathcount.pyo -/opt/xensource/sm/mpathutil.py -/opt/xensource/sm/mpathutil.pyc -/opt/xensource/sm/mpathutil.pyo -/opt/xensource/sm/mpp_luncheck.py -/opt/xensource/sm/mpp_luncheck.pyc -/opt/xensource/sm/mpp_luncheck.pyo -/opt/xensource/sm/mpp_mpathutil.py -/opt/xensource/sm/mpp_mpathutil.pyc -/opt/xensource/sm/mpp_mpathutil.pyo -/opt/xensource/sm/nfs.py -/opt/xensource/sm/nfs.pyc -/opt/xensource/sm/nfs.pyo -/opt/xensource/sm/refcounter.py -/opt/xensource/sm/refcounter.pyc -/opt/xensource/sm/refcounter.pyo -/opt/xensource/sm/resetvdis.py -/opt/xensource/sm/resetvdis.pyc -/opt/xensource/sm/resetvdis.pyo -/opt/xensource/sm/runvmpr -/opt/xensource/sm/scsiutil.py -/opt/xensource/sm/scsiutil.pyc -/opt/xensource/sm/scsiutil.pyo -/opt/xensource/sm/scsi_host_rescan.py -/opt/xensource/sm/scsi_host_rescan.pyc -/opt/xensource/sm/scsi_host_rescan.pyo -/opt/xensource/sm/snapwatchd/_xslib.so -/opt/xensource/sm/snapwatchd/snapwatchd -/opt/xensource/sm/snapwatchd/xslib.py -/opt/xensource/sm/snapwatchd/xslib.pyc -/opt/xensource/sm/snapwatchd/xslib.pyo -/opt/xensource/sm/sysdevice.py -/opt/xensource/sm/sysdevice.pyc -/opt/xensource/sm/sysdevice.pyo -/opt/xensource/sm/udevSR -/opt/xensource/sm/udevSR.py -/opt/xensource/sm/udevSR.pyc -/opt/xensource/sm/udevSR.pyo -/opt/xensource/sm/updatempppathd.py -/opt/xensource/sm/updatempppathd.pyc -/opt/xensource/sm/updatempppathd.pyo -/opt/xensource/sm/util.py -/opt/xensource/sm/util.pyc -/opt/xensource/sm/util.pyo -/opt/xensource/sm/vhdutil.py -/opt/xensource/sm/vhdutil.pyc -/opt/xensource/sm/vhdutil.pyo -/opt/xensource/sm/vss_control -/opt/xensource/sm/xs_errors.py -/opt/xensource/sm/xs_errors.pyc -/opt/xensource/sm/xs_errors.pyo +/usr/lib/xcp/debug/tp +/usr/lib/xcp/lib/check-device-sharing +/usr/lib/xcp/lib/dcopy +/usr/lib/xcp/lib/local-device-change +/usr/lib/xcp/sm/DummySR +/usr/lib/xcp/sm/DummySR.py +/usr/lib/xcp/sm/DummySR.pyc +/usr/lib/xcp/sm/DummySR.pyo +/usr/lib/xcp/sm/EXTSR +/usr/lib/xcp/sm/EXTSR.py +/usr/lib/xcp/sm/EXTSR.pyc +/usr/lib/xcp/sm/EXTSR.pyo +/usr/lib/xcp/sm/FileSR +/usr/lib/xcp/sm/FileSR.py +/usr/lib/xcp/sm/FileSR.pyc +/usr/lib/xcp/sm/FileSR.pyo +/usr/lib/xcp/sm/HBASR +/usr/lib/xcp/sm/HBASR.py +/usr/lib/xcp/sm/HBASR.pyc +/usr/lib/xcp/sm/HBASR.pyo +/usr/lib/xcp/sm/ISCSISR +/usr/lib/xcp/sm/ISCSISR.py +/usr/lib/xcp/sm/ISCSISR.pyc +/usr/lib/xcp/sm/ISCSISR.pyo +/usr/lib/xcp/sm/ISOSR +/usr/lib/xcp/sm/ISOSR.py +/usr/lib/xcp/sm/ISOSR.pyc +/usr/lib/xcp/sm/ISOSR.pyo +/usr/lib/xcp/sm/LUNperVDI.py +/usr/lib/xcp/sm/LUNperVDI.pyc +/usr/lib/xcp/sm/LUNperVDI.pyo +/usr/lib/xcp/sm/LVHDSR.py +/usr/lib/xcp/sm/LVHDSR.pyc +/usr/lib/xcp/sm/LVHDSR.pyo +/usr/lib/xcp/sm/LVHDoHBASR.py +/usr/lib/xcp/sm/LVHDoHBASR.pyc +/usr/lib/xcp/sm/LVHDoHBASR.pyo +/usr/lib/xcp/sm/LVHDoISCSISR.py +/usr/lib/xcp/sm/LVHDoISCSISR.pyc +/usr/lib/xcp/sm/LVHDoISCSISR.pyo +/usr/lib/xcp/sm/LVMSR +/usr/lib/xcp/sm/LVMoHBASR +/usr/lib/xcp/sm/LVMoISCSISR +/usr/lib/xcp/sm/NFSSR +/usr/lib/xcp/sm/NFSSR.py +/usr/lib/xcp/sm/NFSSR.pyc +/usr/lib/xcp/sm/NFSSR.pyo +/usr/lib/xcp/sm/SHMSR.py +/usr/lib/xcp/sm/SHMSR.pyc +/usr/lib/xcp/sm/SHMSR.pyo +/usr/lib/xcp/sm/SR.py +/usr/lib/xcp/sm/SR.pyc +/usr/lib/xcp/sm/SR.pyo +/usr/lib/xcp/sm/SRCommand.py +/usr/lib/xcp/sm/SRCommand.pyc +/usr/lib/xcp/sm/SRCommand.pyo +/usr/lib/xcp/sm/VDI.py +/usr/lib/xcp/sm/VDI.pyc +/usr/lib/xcp/sm/VDI.pyo +/usr/lib/xcp/sm/XE_SR_ERRORCODES.xml +/usr/lib/xcp/sm/blktap2.py +/usr/lib/xcp/sm/blktap2.pyc +/usr/lib/xcp/sm/blktap2.pyo +/usr/lib/xcp/sm/cleanup.py +/usr/lib/xcp/sm/cleanup.pyc +/usr/lib/xcp/sm/cleanup.pyo +/usr/lib/xcp/sm/devscan.py +/usr/lib/xcp/sm/devscan.pyc +/usr/lib/xcp/sm/devscan.pyo +/usr/lib/xcp/sm/fjournaler.py +/usr/lib/xcp/sm/fjournaler.pyc +/usr/lib/xcp/sm/fjournaler.pyo +/usr/lib/xcp/sm/flock.py +/usr/lib/xcp/sm/flock.pyc +/usr/lib/xcp/sm/flock.pyo +/usr/lib/xcp/sm/ipc.py +/usr/lib/xcp/sm/ipc.pyc +/usr/lib/xcp/sm/ipc.pyo +/usr/lib/xcp/sm/iscsilib.py +/usr/lib/xcp/sm/iscsilib.pyc +/usr/lib/xcp/sm/iscsilib.pyo +/usr/lib/xcp/sm/journaler.py +/usr/lib/xcp/sm/journaler.pyc +/usr/lib/xcp/sm/journaler.pyo +/usr/lib/xcp/sm/lcache.py +/usr/lib/xcp/sm/lcache.pyc +/usr/lib/xcp/sm/lcache.pyo +/usr/lib/xcp/sm/lock.py +/usr/lib/xcp/sm/lock.pyc +/usr/lib/xcp/sm/lock.pyo +/usr/lib/xcp/sm/lvhdutil.py +/usr/lib/xcp/sm/lvhdutil.pyc +/usr/lib/xcp/sm/lvhdutil.pyo +/usr/lib/xcp/sm/lvmanager.py +/usr/lib/xcp/sm/lvmanager.pyc +/usr/lib/xcp/sm/lvmanager.pyo +/usr/lib/xcp/sm/lvmcache.py +/usr/lib/xcp/sm/lvmcache.pyc +/usr/lib/xcp/sm/lvmcache.pyo +/usr/lib/xcp/sm/lvutil.py +/usr/lib/xcp/sm/lvutil.pyc +/usr/lib/xcp/sm/lvutil.pyo +/usr/lib/xcp/sm/metadata.py +/usr/lib/xcp/sm/metadata.pyc +/usr/lib/xcp/sm/metadata.pyo +/usr/lib/xcp/sm/srmetadata.py +/usr/lib/xcp/sm/srmetadata.pyc +/usr/lib/xcp/sm/srmetadata.pyo +/usr/lib/xcp/sm/mpathHBA +/usr/lib/xcp/sm/mpath_cli.py +/usr/lib/xcp/sm/mpath_cli.pyc +/usr/lib/xcp/sm/mpath_cli.pyo +/usr/lib/xcp/sm/mpath_dmp.py +/usr/lib/xcp/sm/mpath_dmp.pyc +/usr/lib/xcp/sm/mpath_dmp.pyo +/usr/lib/xcp/sm/mpath_null.py +/usr/lib/xcp/sm/mpath_null.pyc +/usr/lib/xcp/sm/mpath_null.pyo +/usr/lib/xcp/sm/mpathcount.py +/usr/lib/xcp/sm/mpathcount.pyc +/usr/lib/xcp/sm/mpathcount.pyo +/usr/lib/xcp/sm/mpathutil.py +/usr/lib/xcp/sm/mpathutil.pyc +/usr/lib/xcp/sm/mpathutil.pyo +/usr/lib/xcp/sm/mpp_luncheck.py +/usr/lib/xcp/sm/mpp_luncheck.pyc +/usr/lib/xcp/sm/mpp_luncheck.pyo +/usr/lib/xcp/sm/mpp_mpathutil.py +/usr/lib/xcp/sm/mpp_mpathutil.pyc +/usr/lib/xcp/sm/mpp_mpathutil.pyo +/usr/lib/xcp/sm/nfs.py +/usr/lib/xcp/sm/nfs.pyc +/usr/lib/xcp/sm/nfs.pyo +/usr/lib/xcp/sm/refcounter.py +/usr/lib/xcp/sm/refcounter.pyc +/usr/lib/xcp/sm/refcounter.pyo +/usr/lib/xcp/sm/resetvdis.py +/usr/lib/xcp/sm/resetvdis.pyc +/usr/lib/xcp/sm/resetvdis.pyo +/usr/lib/xcp/sm/runvmpr +/usr/lib/xcp/sm/scsiutil.py +/usr/lib/xcp/sm/scsiutil.pyc +/usr/lib/xcp/sm/scsiutil.pyo +/usr/lib/xcp/sm/scsi_host_rescan.py +/usr/lib/xcp/sm/scsi_host_rescan.pyc +/usr/lib/xcp/sm/scsi_host_rescan.pyo +/usr/lib/xcp/sm/snapwatchd/_xslib.so +/usr/lib/xcp/sm/snapwatchd/snapwatchd +/usr/lib/xcp/sm/snapwatchd/xslib.py +/usr/lib/xcp/sm/snapwatchd/xslib.pyc +/usr/lib/xcp/sm/snapwatchd/xslib.pyo +/usr/lib/xcp/sm/sysdevice.py +/usr/lib/xcp/sm/sysdevice.pyc +/usr/lib/xcp/sm/sysdevice.pyo +/usr/lib/xcp/sm/udevSR +/usr/lib/xcp/sm/udevSR.py +/usr/lib/xcp/sm/udevSR.pyc +/usr/lib/xcp/sm/udevSR.pyo +/usr/lib/xcp/sm/updatempppathd.py +/usr/lib/xcp/sm/updatempppathd.pyc +/usr/lib/xcp/sm/updatempppathd.pyo +/usr/lib/xcp/sm/util.py +/usr/lib/xcp/sm/util.pyc +/usr/lib/xcp/sm/util.pyo +/usr/lib/xcp/sm/vhdutil.py +/usr/lib/xcp/sm/vhdutil.pyc +/usr/lib/xcp/sm/vhdutil.pyo +/usr/lib/xcp/sm/vss_control +/usr/lib/xcp/sm/xs_errors.py +/usr/lib/xcp/sm/xs_errors.pyc +/usr/lib/xcp/sm/xs_errors.pyo /sbin/mpathutil -"/opt/xensource/debug/XenCert/READ ME FIRST.txt" -/opt/xensource/debug/XenCert/StorageHandler.py -/opt/xensource/debug/XenCert/StorageHandler.pyc -/opt/xensource/debug/XenCert/StorageHandler.pyo -/opt/xensource/debug/XenCert/StorageHandlerUtil.py -/opt/xensource/debug/XenCert/StorageHandlerUtil.pyc -/opt/xensource/debug/XenCert/StorageHandlerUtil.pyo -/opt/xensource/debug/XenCert/XenCert -"/opt/xensource/debug/XenCert/XenCert 2 0 Guide_6 0.docx" -/opt/xensource/debug/XenCert/XenCertCommon.py -/opt/xensource/debug/XenCert/XenCertCommon.pyc -/opt/xensource/debug/XenCert/XenCertCommon.pyo -"/opt/xensource/debug/XenCert/XenCert_6 0_Verification_Results_CheckList.docx" -/opt/xensource/debug/XenCert/blockunblockHBAPort.sh.brocade -/opt/xensource/debug/XenCert/blockunblockHBAPort.sh.cisco -/opt/xensource/debug/XenCert/blockunblockHBAPort.sh.qlogic -/opt/xensource/debug/XenCert/blockunblockhbapaths-brocade -/opt/xensource/debug/XenCert/blockunblockhbapaths-cisco -/opt/xensource/debug/XenCert/blockunblockhbapaths-qlogic -/opt/xensource/debug/XenCert/blockunblockiscsipaths -/opt/xensource/debug/XenCert/blockunblockpaths -/opt/xensource/debug/XenCert/diskdatatest -/opt/xensource/debug/XenCert/isl_config_netapp.conf +"/usr/lib/xcp/debug/XenCert/READ ME FIRST.txt" +/usr/lib/xcp/debug/XenCert/StorageHandler.py +/usr/lib/xcp/debug/XenCert/StorageHandler.pyc +/usr/lib/xcp/debug/XenCert/StorageHandler.pyo +/usr/lib/xcp/debug/XenCert/StorageHandlerUtil.py +/usr/lib/xcp/debug/XenCert/StorageHandlerUtil.pyc +/usr/lib/xcp/debug/XenCert/StorageHandlerUtil.pyo +/usr/lib/xcp/debug/XenCert/XenCert +"/usr/lib/xcp/debug/XenCert/XenCert 2 0 Guide_6 0.docx" +/usr/lib/xcp/debug/XenCert/XenCertCommon.py +/usr/lib/xcp/debug/XenCert/XenCertCommon.pyc +/usr/lib/xcp/debug/XenCert/XenCertCommon.pyo +"/usr/lib/xcp/debug/XenCert/XenCert_6 0_Verification_Results_CheckList.docx" +/usr/lib/xcp/debug/XenCert/blockunblockHBAPort.sh.brocade +/usr/lib/xcp/debug/XenCert/blockunblockHBAPort.sh.cisco +/usr/lib/xcp/debug/XenCert/blockunblockHBAPort.sh.qlogic +/usr/lib/xcp/debug/XenCert/blockunblockhbapaths-brocade +/usr/lib/xcp/debug/XenCert/blockunblockhbapaths-cisco +/usr/lib/xcp/debug/XenCert/blockunblockhbapaths-qlogic +/usr/lib/xcp/debug/XenCert/blockunblockiscsipaths +/usr/lib/xcp/debug/XenCert/blockunblockpaths +/usr/lib/xcp/debug/XenCert/diskdatatest +/usr/lib/xcp/debug/XenCert/isl_config_netapp.conf %changelog diff --git a/mpathroot/mpathroot.init b/mpathroot/mpathroot.init index 3f87cd7..4efeb2d 100644 --- a/mpathroot/mpathroot.init +++ b/mpathroot/mpathroot.init @@ -42,7 +42,7 @@ start() { logger -t "${TAG}" "Updating multipath root status" echo -n $"Updating multipath root status: " if wait_for_xapi; then - /opt/xensource/sm/mpathcount.py + /usr/lib/xcp/sm/mpathcount.py success $"OK" exit 0 else diff --git a/scripts/local-device-change b/scripts/local-device-change index 9943112..57fec20 100755 --- a/scripts/local-device-change +++ b/scripts/local-device-change @@ -19,9 +19,9 @@ DEVICE=$1 # foo /usr/bin/logger "local-device-change DEVICE=$DEVICE ACTION=$ACTION" -CDROMMON="/opt/xensource/libexec/cdrommon" +CDROMMON="/usr/lib/xcp/lib/cdrommon" -. /etc/xensource-inventory +. /etc/xcp/inventory function remove_vdi { local R_VDI=$1 diff --git a/snapwatchd/Makefile b/snapwatchd/Makefile index a03847e..98cb1a9 100644 --- a/snapwatchd/Makefile +++ b/snapwatchd/Makefile @@ -1,7 +1,7 @@ XS_INCLUDE ?= /usr/include XS_LIB ?= -lxenstore -PREFIX ?= /opt/xensource/sm/snapwatchd +PREFIX ?= /usr/lib/xcp/sm/snapwatchd INITDIR ?= /etc/rc.d/init.d DESTDIR ?= diff --git a/snapwatchd/snapwatchd b/snapwatchd/snapwatchd index d581b45..103e38a 100755 --- a/snapwatchd/snapwatchd +++ b/snapwatchd/snapwatchd @@ -19,7 +19,7 @@ import XenAPI import xml.dom.minidom import datetime, time import resource -sys.path.insert(0, "/opt/xensource/sm") +sys.path.insert(0, "/usr/lib/xcp/sm") import util import gc import xs_errors @@ -171,7 +171,7 @@ def _getSnapUUIDlist(h,uuid): return vdi_uuids def get_localhost_uuid(): - filename = '/etc/xensource-inventory' + filename = '/etc/xcp/inventory' try: f = open(filename, 'r') except: diff --git a/snapwatchd/snapwatchd.init b/snapwatchd/snapwatchd.init index 4146a69..d7bfcb2 100755 --- a/snapwatchd/snapwatchd.init +++ b/snapwatchd/snapwatchd.init @@ -9,7 +9,7 @@ # processname: snapwatchd # pidfile: /var/run/snapwatchd.pid -DAEMON=/opt/xensource/sm/snapwatchd/snapwatchd +DAEMON=/usr/lib/xcp/sm/snapwatchd/snapwatchd prog=`basename $DAEMON` pidfile=/var/run/${prog}.pid logfile=/var/log/SMlog diff --git a/tests/XE_api_library.sh b/tests/XE_api_library.sh index c1fc8fb..c27a2da 100755 --- a/tests/XE_api_library.sh +++ b/tests/XE_api_library.sh @@ -1512,7 +1512,7 @@ copy_lvm_plugin() DUMMY_SR_TYPE=$1 subject="Creating dummy SR type (${DUMMY_SR_TYPE})" debug_test "$subject" - cmd="$REM_CMD ln -s /opt/xensource/sm/LVMSR /opt/xensource/sm/${DUMMY_SR_TYPE}SR &> /dev/null" + cmd="$REM_CMD ln -s /usr/lib/xcp/sm/LVMSR /usr/lib/xcp/sm/${DUMMY_SR_TYPE}SR &> /dev/null" run $cmd if [ $RUN_RC -gt 0 ]; then debug_result 2 @@ -1616,7 +1616,7 @@ install_scsiID_helper() { UPLOAD="/tmp/`date +%s-%N`" echo "import sys" >> $UPLOAD - echo "sys.path.insert(0, '/opt/xensource/sm')" >> $UPLOAD + echo "sys.path.insert(0, '/usr/lib/xcp/sm')" >> $UPLOAD echo "import scsiutil" >> $UPLOAD echo "" >> $UPLOAD echo "try:" >> $UPLOAD @@ -1628,7 +1628,7 @@ install_scsiID_helper() { cmd="chmod +x $UPLOAD" run $cmd - cmd="/usr/bin/scp -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -i ${SSH_PRIVATE_KEY} $UPLOAD root@$1:/etc/xensource/SCSIutil.smrt" + cmd="/usr/bin/scp -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -i ${SSH_PRIVATE_KEY} $UPLOAD root@$1:/etc/xcp/SCSIutil.smrt" run $cmd if [ $RUN_RC -ne 0 ]; then debug_result 1 diff --git a/tests/globals.sh b/tests/globals.sh index 28e05d9..5028b4e 100644 --- a/tests/globals.sh +++ b/tests/globals.sh @@ -26,7 +26,7 @@ if [ -z ${USERNAME} ]; then fi if [ -z ${CMD} ]; then - CMD="/opt/xensource/bin/xe" + CMD="/usr/bin/xe" fi if [ -z ${CLONE_DEBUG} ]; then diff --git a/tests/lvhd_test/snapshot_stress.py b/tests/lvhd_test/snapshot_stress.py index fba435e..15e699d 100755 --- a/tests/lvhd_test/snapshot_stress.py +++ b/tests/lvhd_test/snapshot_stress.py @@ -4,7 +4,7 @@ import sys import random import pickle -sys.path.append("/opt/xensource/sm") +sys.path.append("/usr/lib/xcp/sm") import cleanup class VDIAction: @@ -266,7 +266,7 @@ if __name__ == "__main__": print "%s rerun " % sys.argv[0] def xe(cmd, *args): - argv = [ "/opt/xensource/bin/xe", cmd ] + argv = [ "/usr/bin/xe", cmd ] argv += args stdin, stdout = os.popen4(argv) return stdout.readlines() diff --git a/tests/lvhd_test/storagemanager.py b/tests/lvhd_test/storagemanager.py index bf6efe3..b7c0260 100644 --- a/tests/lvhd_test/storagemanager.py +++ b/tests/lvhd_test/storagemanager.py @@ -6,7 +6,7 @@ import time import xmlrpclib import tutil -sys.path.append("/opt/xensource/sm") +sys.path.append("/usr/lib/xcp/sm") import util import lvutil import vhdutil @@ -737,7 +737,7 @@ class StorageManagerCLI(StorageManager): def _getThisHost(self): uuid = None - f = open("/etc/xensource-inventory", 'r') + f = open("/etc/xcp/inventory", 'r') for line in f.readlines(): if line.startswith("INSTALLATION_UUID"): uuid = line.split("'")[1] @@ -746,7 +746,7 @@ class StorageManagerCLI(StorageManager): def _getThisDom0(self): uuid = None - f = open("/etc/xensource-inventory", 'r') + f = open("/etc/xcp/inventory", 'r') for line in f.readlines(): if line.startswith("CONTROL_DOMAIN_UUID"): uuid = line.split("'")[1] diff --git a/tests/lvhd_test/testsm.py b/tests/lvhd_test/testsm.py index 609397f..d7902cd 100755 --- a/tests/lvhd_test/testsm.py +++ b/tests/lvhd_test/testsm.py @@ -11,7 +11,7 @@ import random import tutil import storagemanager -sys.path.append("/opt/xensource/sm") +sys.path.append("/usr/lib/xcp/sm") from ipc import IPCFlag import LVHDSR import lvhdutil diff --git a/tests/test1.sh b/tests/test1.sh index 62c3a03..cf44134 100755 --- a/tests/test1.sh +++ b/tests/test1.sh @@ -515,7 +515,7 @@ generate_pattern() subject="Writing disk test pattern" debug_test "$subject" - cmd="$REM_CMD /opt/xensource/debug/tp $1 $2 $3 $4" + cmd="$REM_CMD /usr/lib/xcp/debug/tp $1 $2 $3 $4" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug_result 1 @@ -591,11 +591,11 @@ run_vdi_snapshot_tests() { fi LOOP=10 - cmd="$REM_CMD test -f /opt/xensource/debug/tp" + cmd="$REM_CMD test -f /usr/lib/xcp/debug/tp" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug "The test pattern binary is missing." - debug "Please install tp under /opt/xensource/debug and re-run." + debug "Please install tp under /usr/lib/xcp/debug and re-run." debug "Exiting quietly." return fi diff --git a/tests/test_dcopy.sh b/tests/test_dcopy.sh index ebb2650..97a7eba 100755 --- a/tests/test_dcopy.sh +++ b/tests/test_dcopy.sh @@ -10,20 +10,20 @@ check_dcopy_binaries() { - cmd="$REM_CMD test -f /opt/xensource/debug/tp" + cmd="$REM_CMD test -f /usr/lib/xcp/debug/tp" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug "The test pattern binary is missing." - debug "Please install tp under /opt/xensource/debug and re-run." + debug "Please install tp under /usr/lib/xcp/debug and re-run." debug "Exiting quietly." exit fi - cmd="$REM_CMD test -f /opt/xensource/libexec/dcopy" + cmd="$REM_CMD test -f /usr/lib/xcp/lib/dcopy" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug "The dcopy binary is missing." - debug "Please install dcopy under /opt/xensource/libexec and re-run." + debug "Please install dcopy under /usr/lib/xcp/lib and re-run." debug "Exiting quietly." exit fi @@ -81,7 +81,7 @@ generate_pattern() subject="Writing disk test pattern" debug_test "$subject" - cmd="$REM_CMD /opt/xensource/debug/tp $1 $2 $3 $4" + cmd="$REM_CMD /usr/lib/xcp/debug/tp $1 $2 $3 $4" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug_result 1 @@ -100,7 +100,7 @@ copy_pattern() subject="Copying disk contents" debug_test "$subject" - cmd="$REM_CMD /opt/xensource/libexec/dcopy $1 $2 $3" + cmd="$REM_CMD /usr/lib/xcp/lib/dcopy $1 $2 $3" run "$cmd" if [ $RUN_RC -gt 0 ]; then debug_result 1 diff --git a/tests/test_iscsi_refcount.sh b/tests/test_iscsi_refcount.sh index d9c5f79..b0ebe4b 100755 --- a/tests/test_iscsi_refcount.sh +++ b/tests/test_iscsi_refcount.sh @@ -92,7 +92,7 @@ get_SCSIid_fromLUN() subject="Querying SCSIid for LUN${1}" debug_test "$subject" ADDR=`echo ${ISCSI_RECID} | cut -d',' -f1` - cmd="$REM_CMD python /etc/xensource/SCSIutil.smrt /dev/iscsi/${LISCSI_TARGET_ID}/${ADDR}/LUN${1}" + cmd="$REM_CMD python /etc/xcp/SCSIutil.smrt /dev/iscsi/${LISCSI_TARGET_ID}/${ADDR}/LUN${1}" run $cmd if [ $RUN_RC -ne 0 ]; then debug_result 1 diff --git a/tests/vmprtest b/tests/vmprtest index 8a5fd0a..87c0a23 100755 --- a/tests/vmprtest +++ b/tests/vmprtest @@ -14,7 +14,7 @@ import sys import time import commands from optparse import OptionParser -sys.path.insert(0, '/opt/xensource/sm') +sys.path.insert(0, '/usr/lib/xcp/sm') import util import re import datetime -- debian/patches/0010-fixes-path-to-iscsid.patch0000664000000000000000000000124212045670777016200 0ustar Description: Fixes path to iscsid Under CentOS, it seems they use /sbin/iscsid, but in Debian, it's in /usr/sbin, so we fix that. Author: Thomas Goirand Bug-Debian: http://bugs.debian.org/691805 Forwarded: no --- xcp-storage-managers-0.1.1.orig/drivers/iscsilib.py +++ xcp-storage-managers-0.1.1/drivers/iscsilib.py @@ -194,7 +194,7 @@ def get_luns(targetIQN, portal): raise xs_errors.XenError('ISCSIDevice', opterr='Failed to find any LUNs') def is_iscsi_daemon_running(): - cmd = ["/sbin/pidof", "-s", "/sbin/iscsid"] + cmd = ["/sbin/pidof", "-s", "/usr/sbin/iscsid"] (rc,stdout,stderr) = util.doexec(cmd) return (rc==0) debian/patches/0007-fix-makefile.patch0000664000000000000000000000603612145170026014570 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:02 +0000 Subject: fix-makefile --- Makefile | 15 ++++++++------- snapwatchd/Makefile | 12 ++++++------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index a1ff8c5..fbfbbf5 100644 --- a/Makefile +++ b/Makefile @@ -67,9 +67,10 @@ SM_STAGING := $(DESTDIR) SM_STAMP := $(MY_OBJ_DIR)/.staging_stamp .PHONY: build +build: make -C dcopy make -C snapwatchd - make -C mpathroot + #make -C mpathroot .PHONY: install install: @@ -99,7 +100,7 @@ install: cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDSR && ln -sf LVHDSR.py LVMSR cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoISCSISR && ln -sf LVHDoISCSISR.py LVMoISCSISR cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoHBASR && ln -sf LVHDoHBASR.py LVMoHBASR - ln -sf $(SM_DEST)mpathutil.py $(SM_STAGING)/sbin/mpathutil + #ln -sf $(SM_DEST)mpathutil.py $(SM_STAGING)/sbin/mpathutil install -m 755 drivers/02-vhdcleanup $(SM_STAGING)$(MASTER_SCRIPT_DEST) install -m 755 drivers/lvhd-thin $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) install -m 755 drivers/on-slave $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) @@ -115,12 +116,12 @@ install: install -m 755 scripts/check-device-sharing $(SM_STAGING)$(LIBEXEC) $(MAKE) -C dcopy install DESTDIR=$(SM_STAGING) $(MAKE) -C snapwatchd install DESTDIR=$(SM_STAGING) - $(MAKE) -C mpathroot install DESTDIR=$(SM_STAGING) +# $(MAKE) -C mpathroot install DESTDIR=$(SM_STAGING) ln -sf $(SM_DEST)blktap2.py $(SM_STAGING)$(BIN_DEST)/blktap2 - install -m 755 -d $(SM_STAGING)$(CRON_DEST) - install -m 644 $(CRON_JOBS:%=etc/cron.d/%) -t $(SM_STAGING)$(CRON_DEST) - install -m 755 drivers/runvmpr $(SM_STAGING)$(SM_DEST) - install -m 755 drivers/vmpr $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) +# install -m 755 -d $(SM_STAGING)$(CRON_DEST) +# install -m 644 $(CRON_JOBS:%=etc/cron.d/%) -t $(SM_STAGING)$(CRON_DEST) +# install -m 755 drivers/runvmpr $(SM_STAGING)$(SM_DEST) +# install -m 755 drivers/vmpr $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) ln -sf $(SM_DEST)lcache.py $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats .PHONY: clean diff --git a/snapwatchd/Makefile b/snapwatchd/Makefile index addcbfb..db64ea8 100644 --- a/snapwatchd/Makefile +++ b/snapwatchd/Makefile @@ -5,7 +5,7 @@ PREFIX ?= /usr/lib/xcp/sm/snapwatchd INITDIR ?= /etc/rc.d/init.d DESTDIR ?= -PYTHON_INCLUDE ?= /usr/include/python2.4 +PYTHON_INCLUDE ?= /usr/include/python2.7 CFLAGS ?= -O2 CFLAGS += -I$(PYTHON_INCLUDE) -I$(XS_INCLUDE) -fPIC @@ -17,13 +17,13 @@ all: _xslib.so @ : .PHONY: install -install: _xslib.so xslib.py snapwatchd +install: _xslib.so xslib.py mkdir -p $(DESTDIR)$(PREFIX) install -m 644 $^ $(DESTDIR)$(PREFIX) - chmod +x $(DESTDIR)$(PREFIX)/snapwatchd - mkdir -p $(DESTDIR)$(INITDIR) - cp snapwatchd.init $(DESTDIR)$(INITDIR)/snapwatchd - chmod +x $(DESTDIR)$(INITDIR)/snapwatchd + #chmod +x $(DESTDIR)$(PREFIX)/snapwatchd + #mkdir -p $(DESTDIR)$(INITDIR) + #cp snapwatchd.init $(DESTDIR)$(INITDIR)/snapwatchd + #chmod +x $(DESTDIR)$(INITDIR)/snapwatchd %.py %_wrap.c: %.i $(SWIG) -python $< -- debian/patches/series0000664000000000000000000000063112045670777012053 0ustar 0001-install-dirs.patch 0002-lvm2-path.patch 0003-fpic-on-xslib.patch 0004-remove-xencert.patch 0005-vhd-util-path.patch 0006-fix-local-device-change.patch 0007-fix-makefile.patch 0008-remove-primary-disk-dependency.patch 0009-disable-block-SRs.patch 0010-fixes-path-to-iscsid.patch 0011-fix-wrong-parameter-to-vgchange.patch 0012-fixes-path-to-scsi_id-in-scsiutil.py.patch 0013-Fix-guest-CDROM-hotplug.patch debian/patches/0006-fix-local-device-change.patch0000664000000000000000000000127712045670777016607 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:02 +0000 Subject: fix-local-device-change # HG changeset patch # Parent 48aa86a502ee5df1519d3ea42528c77d8fcf9ff6 --- scripts/local-device-change | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/local-device-change b/scripts/local-device-change index 57fec20..2929bf1 100755 --- a/scripts/local-device-change +++ b/scripts/local-device-change @@ -23,7 +23,7 @@ CDROMMON="/usr/lib/xcp/lib/cdrommon" . /etc/xcp/inventory -function remove_vdi { +remove_vdi () { local R_VDI=$1 for VBD in `xe vbd-list params=uuid vdi-uuid=${R_VDI} currently-attached=true --minimal` do -- debian/patches/0003-fpic-on-xslib.patch0000664000000000000000000000103512045670777014710 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:01 +0000 Subject: fpic-on-xslib --- snapwatchd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/snapwatchd/Makefile b/snapwatchd/Makefile index 98cb1a9..addcbfb 100644 --- a/snapwatchd/Makefile +++ b/snapwatchd/Makefile @@ -8,7 +8,7 @@ DESTDIR ?= PYTHON_INCLUDE ?= /usr/include/python2.4 CFLAGS ?= -O2 -CFLAGS += -I$(PYTHON_INCLUDE) -I$(XS_INCLUDE) +CFLAGS += -I$(PYTHON_INCLUDE) -I$(XS_INCLUDE) -fPIC SWIG ?= swig -- debian/patches/0005-vhd-util-path.patch0000664000000000000000000000167712045670777014742 0ustar From: Jon Ludlam Date: Thu, 8 Dec 2011 17:06:01 +0000 Subject: vhd-util-path --- drivers/vhdutil.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vhdutil.py b/drivers/vhdutil.py index 10b6994..6ddcd32 100644 --- a/drivers/vhdutil.py +++ b/drivers/vhdutil.py @@ -23,7 +23,7 @@ import zlib MAX_VHD_JOURNAL_SIZE = 6 * 1024 * 1024 # 2MB VHD block size, max 2TB VHD size MAX_CHAIN_SIZE = 30 # max VHD parent chain size -VHD_UTIL = "/usr/sbin/vhd-util" +VHD_UTIL = "/usr/bin/vhd-util" OPT_LOG_ERR = "--debug" VHD_BLOCK_SIZE = 2 * 1024 * 1024 VHD_FOOTER_SIZE = 512 @@ -301,7 +301,7 @@ def _parseVHDInfo(line, extractUuidFunction): return vhdInfo def _getVHDParentNoCheck(path): - cmd = ["vhd-util", "read", "-p", "-n", "%s" % path] + cmd = [VHD_UTIL, "read", "-p", "-n", "%s" % path] text = util.pread(cmd) util.SMlog(text) for line in text.split('\n'): -- debian/patches/0012-fixes-path-to-scsi_id-in-scsiutil.py.patch0000664000000000000000000000123112045670777021227 0ustar Description: Fixes path to scsi_id in scsiutil.py scsiutil.py calls scsi_id which isn't in the path, it's in /lib/udev in Debian, so this patch fixes it. Author: Thomas Goirand Bug-Debian: http://bugs.debian.org/691808 Forwarded: no --- xcp-storage-managers-0.1.1.orig/drivers/scsiutil.py +++ xcp-storage-managers-0.1.1/drivers/scsiutil.py @@ -83,7 +83,7 @@ def SCSIid_sanitise(str): def getSCSIid(path): dev = rawdev(path) - cmd = ["scsi_id", "-g", "-s", "/block/%s" % dev] + cmd = ["/lib/udev/scsi_id", "-g", "-s", "/block/%s" % dev] return SCSIid_sanitise(util.pread2(cmd)[:-1]) def compareSCSIid_2_6_18(SCSIid, path): debian/patches/0008-remove-primary-disk-dependency.patch0000664000000000000000000000115012045670777020263 0ustar From: PKG-Xen Devel Date: Wed, 14 Dec 2011 18:07:23 +0000 Subject: remove-primary-disk-dependency --- drivers/util.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/util.py b/drivers/util.py index 54b99ac..bf1f8ab 100644 --- a/drivers/util.py +++ b/drivers/util.py @@ -519,7 +519,7 @@ def getrootdev(): for line in filter(match_rootdev, f.readlines()): rootdev = line.split("'")[1] if not rootdev: - raise xs_errors.XenError('NoRootDev') + return "/dev/null" return rootdev def getrootdevID(): -- debian/patches/0013-Fix-guest-CDROM-hotplug.patch0000664000000000000000000000166212045670777016442 0ustar Description: Fix guest CDROM hotplug The ISOSR driver erroneously tagged all ISO VDIs as 'file' types when it should have tagged them as 'phy' types. The XenServer hotplug scripts are quite simple, and don't distinguish between these two types. The upstream Xen 4.1 hotplug scripts, however, are quite robust, and would refuse to plug the CDROM devices into the guest because the backend paths that contained the CDROM images were block devices and not files. Author: Mike McClurg Bug-Debian: http://bugs.debian.org/687319 Origin: upstream Last-Update: 2012-09-04 --- xcp-storage-managers-0.1.1.orig/drivers/ISOSR.py +++ xcp-storage-managers-0.1.1/drivers/ISOSR.py @@ -191,7 +191,7 @@ class ISOSR(SR.SR): self.path = self.mountpoint # Some info we need: - self.sr_vditype = 'file' + self.sr_vditype = 'phy' self.credentials = None def attach(self, sr_uuid): debian/patches/0009-disable-block-SRs.patch0000664000000000000000000000325212045670777015447 0ustar From: Mike McClurg Date: Thu, 8 Dec 2011 15:18:46 +0000 Subject: disable block SRs We suspect that block SRs are broken in Kronos, so we'll disable them for now. We're just removing the symlink to the SR backend Python scripts, so brave users could just recreate the symlinks to reenable the SRs. Signed-off-by: Mike McClurg --- Makefile | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) --- a/Makefile +++ b/Makefile @@ -12,6 +12,8 @@ SM_DRIVERS += LVHDoHBA SM_DRIVERS += SHM +SM_DRIVERS_ENABLED := File NFS EXT Dummy ISO + SM_LIBS := SR SM_LIBS += SRCommand SM_LIBS += VDI @@ -93,13 +95,13 @@ for i in $(SM_XML); do \ install -m 755 drivers/$$i.xml \ $(SM_STAGING)$(SM_DEST); done - cd $(SM_STAGING)$(SM_DEST) && for i in $(SM_DRIVERS); do \ + cd $(SM_STAGING)$(SM_DEST) && for i in $(SM_DRIVERS_ENABLED); do \ ln -sf $$i"SR.py" $$i"SR"; \ done - rm $(SM_STAGING)$(SM_DEST)/SHMSR - cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDSR && ln -sf LVHDSR.py LVMSR - cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoISCSISR && ln -sf LVHDoISCSISR.py LVMoISCSISR - cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoHBASR && ln -sf LVHDoHBASR.py LVMoHBASR +# rm $(SM_STAGING)$(SM_DEST)/SHMSR +# cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDSR && ln -sf LVHDSR.py LVMSR +# cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoISCSISR && ln -sf LVHDoISCSISR.py LVMoISCSISR +# cd $(SM_STAGING)$(SM_DEST) && rm -f LVHDoHBASR && ln -sf LVHDoHBASR.py LVMoHBASR #ln -sf $(SM_DEST)mpathutil.py $(SM_STAGING)/sbin/mpathutil install -m 755 drivers/02-vhdcleanup $(SM_STAGING)$(MASTER_SCRIPT_DEST) install -m 755 drivers/lvhd-thin $(SM_STAGING)$(PLUGIN_SCRIPT_DEST) debian/README.source0000664000000000000000000000031512045670777011365 0ustar xcp-storage-managers for Debian ----------------- debian/source/0000775000000000000000000000000012045670777010507 5ustar debian/source/format0000664000000000000000000000001412045670777011715 0ustar 3.0 (quilt) debian/changelog0000664000000000000000000000177212145170167011055 0ustar xcp-storage-managers (0.1.1-3.1) unstable; urgency=low * Non maintainer upload (acknowledged by Mike McClurg). * Fix build failure with python2.7 only. Closes: #707463. -- Matthias Klose Thu, 16 May 2013 16:41:39 +0200 xcp-storage-managers (0.1.1-3) unstable; urgency=low * Added missing dependency on sg3-utils and open-iscsi (Closes: #691806). * Fixes path to iscsid in iscsilib.py (Closes: #691805). * Fixes path to scsi_id in scsiutil.py, removes unknown --master parameter in lvutil.py (Closes: #691808). * Fix CDROM guest hotplug bug (LP: #1045739) (Closes: #687319). * Added a watch file. * Build-Conflicts: xcp-storage-managers, since that's just what happened to me at the dh_python2 stage. -- Thomas Goirand Sun, 04 Nov 2012 18:54:52 +0000 xcp-storage-managers (0.1.1-2) unstable; urgency=low * New FHS compliant layout * Initial release (Closes: #646722) -- Jon Ludlam Wed, 07 Dec 2011 17:25:32 +0000 debian/compat0000664000000000000000000000000212045670777010405 0ustar 8 debian/copyright0000664000000000000000000001271712045670777011152 0ustar Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174 Upstream-Name: xcp-storage-managers Source: http://www.xen.org/products/cloudxen.html Files: * Copyright: 2007 Citrix Systems License: LGPL-2.1 This program is released under the LGPL version 2.1 with the additional exemption that compiling, linking, and/or using OpenSSL is allowed. . As a special exception to the GNU Library General Public License, you may also link, statically or dynamically, a "work that uses the Library" with a publicly distributed version of the Library to produce an executable file containing portions of the Library, and distribute that executable file under terms of your choice, without any of the additional requirements listed in clause 6 of the GNU Library General Public License. By "a publicly distributed version of the Library", we mean either the unmodified Library, or a modified version of the Library that is distributed under the conditions defined in clause 3 of the GNU Library General Public License. This exception does not however invalidate any other reasons why the executable file might be covered by the GNU Library General Public License. . The complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. . This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. . This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. Files: dcopy/atomicio.c dcopy/atomicio.h Copyright: (c) 2005 Anil Madhavapeddy. All rights reserved. (c) 1995,1999 Theo de Raadt. All rights reserved. License: 2 clauses BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. . THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: drivers/VASSR.py Copyright: (c) 2010 VA Linux Systems Japan K.K. All rights reserved. License: 3 clauses BSD Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. Neither the name of the Company nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COMPANY AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COMPANY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Files: debian/* Copyright: 2011 Jon Ludlam License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". debian/rules0000775000000000000000000000047712045670777010277 0ustar #!/usr/bin/make -f # -*- makefile -*- #export DH_VERBOSE=1 export DH_OPTIONS %: dh $@ --with python2 override_dh_fixperms: dh_testroot dh_fixperms rm -rf debian/xcp-storage-managers/sbin chmod -x debian/xcp-storage-managers/usr/lib/xcp/sm/XE_SR_ERRORCODES.xml override_dh_python2: dh_python2 /usr/lib/xcp/sm debian/control0000664000000000000000000000357412045670777010623 0ustar Source: xcp-storage-managers Section: libs Priority: extra Maintainer: PKG-Xen Devel Uploaders: Thomas Goirand , Jon Ludlam , Mike McClurg Build-Depends: debhelper (>= 8), swig, python-all-dev, libxen-dev, python-all (>= 2.6.6-3~) Build-Conflicts: xcp-storage-managers Standards-Version: 3.9.2 X-Python-Version: >= 2.6 VCS-Git: http://anonscm.debian.org/git/pkg-xen/xcp-storage-managers.git VCS-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xen/xcp-storage-managers.git Homepage: http://www.xen.org/products/cloudxen.html Package: xcp-storage-managers Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, uuid-runtime, blktap-utils, sg3-utils, open-iscsi Recommends: lvm2, nfs-common Description: storage backends for XCP The Xen Cloud Platform (XCP) is an open source enterprise-ready server virtualization and cloud computing platform, with support for a range of guest operating systems, Linux network and storage support. . XCP addresses the needs of cloud providers, hosting services and data centers by combining the isolation and multitenancy capabilities of the Xen hypervisor with enhanced security, storage and network virtualization technologies to offer a rich set of virtual infrastructure cloud services. The platform also address user requirements for security, availability, performance and isolation across both private and public clouds. . XCP consolidates server workloads, enables savings in power, cooling, and management costs and thus contributing to environmentally sustainable computing, an increased ability to adapt to ever-changing IT environments, an optimized use of existing hardware, and an improved level of IT reliability. . This package provides storage backend plugins for various storage types that XCP supports. debian/watch0000664000000000000000000000016212045670777010237 0ustar version=3 http://github.com/mcclurmc/xcp-storage-managers/tags /mcclurmc/xcp-storage-managers/tarball/master/(.+)