Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use OPTDIR rather than BASE_PATH

  • Loading branch information...
commit d6a7d77494bfeef6c2dba05c970dab483362b10a 1 parent 34d0ef0
@jonludlam jonludlam authored
Showing with 244 additions and 220 deletions.
  1. +1 −1  Makefile
  2. +1 −1  ocaml/lvhdrt/lvhdrt-trash-vdi
  3. +2 −2 ocaml/multipathrt/multipathrt-helper
  4. +1 −1  ocaml/toplevel/mkwrapper
  5. +1 −1  ocaml/xapi/OMakefile
  6. +1 −1  ocaml/xapi/config_constants.ml.in
  7. +1 −1  ocaml/xapi/quicktest
  8. +1 −1  ocaml/xe-cli/rt/install-debian-pv.sh
  9. +1 −1  scripts/10resetvdis
  10. +1 −1  scripts/backup-metadata-cron
  11. +2 −2 scripts/debug_ha_query_liveset
  12. +2 −2 scripts/examples/python/monitor-unwanted-domains.py
  13. +1 −1  scripts/fence
  14. +1 −1  scripts/init.d-genptoken
  15. +1 −1  scripts/init.d-management-interface
  16. +1 −1  scripts/init.d-perfmon
  17. +2 −2 scripts/init.d-squeezed
  18. +1 −1  scripts/init.d-v6d
  19. +4 −4 scripts/init.d-xapi
  20. +1 −1  scripts/init.d-xapi-domains
  21. +1 −1  scripts/init.d-xapissl
  22. +5 −5 scripts/init.d-xenservices
  23. +28 −4 scripts/install.sh
  24. +1 −1  scripts/interface-visualise
  25. +1 −1  scripts/license-check.py
  26. +1 −1  scripts/mpathalert-daemon
  27. +1 −1  scripts/plugins/iovirt
  28. +1 −1  scripts/rewrite-management-interface
  29. +1 −1  scripts/runtests
  30. +1 −1  scripts/sysconfig-perfmon
  31. +1 −1  scripts/vncterm-wrapper
  32. +1 −1  scripts/xapi-rolling-upgrade-miami
  33. +4 −4 scripts/xe-backup-metadata
  34. +1 −1  scripts/xe-edit-bootloader
  35. +1 −1  scripts/xe-mount-iso-sr
  36. +1 −1  scripts/xe-reset-networking
  37. +4 −4 scripts/xe-restore-metadata
  38. +1 −1  scripts/xe-set-iscsi-iqn
  39. +1 −1  scripts/xe-xentrace
  40. +161 −161 xapi.spec.in
View
2  Makefile
@@ -125,7 +125,7 @@ ocaml/fhs.ml :
.PHONY: xapi.spec
xapi.spec: xapi.spec.in
sed -e 's/@RPM_RELEASE@/$(shell git rev-list HEAD | wc -l)/g' < $< > $@
- sed -i "s!@BASE_PATH@!${BASE_PATH}!g" $@
+ sed -i "s!@OPTDIR@!${OPTDIR}!g" $@
.PHONY: srpm
srpm: xapi.spec
View
2  ocaml/lvhdrt/lvhdrt-trash-vdi
@@ -20,7 +20,7 @@ import os, sys, tempfile
import XenAPI, inventory
import XenAPIPlugin
-sm_dir = "@BASE_PATH@/sm"
+sm_dir = "@OPTDIR@/sm"
def dd(input, output):
os.system("dd if=%s of=%s bs=1M count=16" % (input, output))
View
4 ocaml/multipathrt/multipathrt-helper
@@ -16,8 +16,8 @@ dmsetup = "/sbin/dmsetup"
iptables = "/sbin/iptables"
dd = "/bin/dd"
scli = "/usr/local/bin/scli"
-list_domains = "@BASE_PATH@/bin/list_domains"
-xs = "@BASE_PATH@/debug/xs"
+list_domains = "@OPTDIR@/bin/list_domains"
+xs = "@OPTDIR@/debug/xs"
def doexec(args, inputtext=None):
"""Execute a subprocess, then return its return code, stdout and stderr"""
View
2  ocaml/toplevel/mkwrapper
@@ -2,5 +2,5 @@
echo "#!/bin/bash" > xencaml
ROOT=`cd .. && pwd`
-echo "`pwd`/xencaml-bin.run -I @BASE_PATH@/lib/site-lib/stdext -I @BASE_PATH@/lib/site-lib/str -I @BASE_PATH@/lib/site-lib/xml-light2 -I @BASE_PATH@/lib/xmlm -I $ROOT/idl/ocaml_backend -I $ROOT/idl -I $ROOT/autogen/ -I $ROOT/http -I $ROOT/util \$@" >> xencaml
+echo "`pwd`/xencaml-bin.run -I @OPTDIR@/lib/site-lib/stdext -I @OPTDIR@/lib/site-lib/str -I @OPTDIR@/lib/site-lib/xml-light2 -I @OPTDIR@/lib/xmlm -I $ROOT/idl/ocaml_backend -I $ROOT/idl -I $ROOT/autogen/ -I $ROOT/http -I $ROOT/util \$@" >> xencaml
chmod 755 xencaml
View
2  ocaml/xapi/OMakefile
@@ -283,7 +283,7 @@ OCamlProgram(at_least_once_more, at_least_once_more at_least_once_more_test)
generate_constants: config_constants.ml
config_constants.ml: config_constants.ml.in
- sed "s!@BASE_PATH@!\"$(OPTDIR)\"!" $< > $@
+ sed "s!@OPTDIR@!\"$(OPTDIR)\"!" $< > $@
.PHONY: install
install:
View
2  ocaml/xapi/config_constants.ml.in
@@ -1 +1 @@
-let base_path = @BASE_PATH@
+let base_path = @OPTDIR@
View
2  ocaml/xapi/quicktest
@@ -1,4 +1,4 @@
#!/bin/bash
# Run quicktest with support for exception backtraces.
-OCAMLRUNPARAM=b "@BASE_PATH@/debug/quicktestbin" "$@"
+OCAMLRUNPARAM=b "@OPTDIR@/debug/quicktestbin" "$@"
View
2  ocaml/xe-cli/rt/install-debian-pv.sh
@@ -49,7 +49,7 @@ VIF=`xe vif-create vm-uuid=${VM} network-uuid=${NETWORK} device=0`
VDI=`xe vbd-list vm-uuid=${VM} userdevice=0 params=vdi-uuid --minimal`
# Run the inner-script bit:
-"@BASE_PATH@/debug/with-vdi" ${VDI} "@BASE_PATH@/debug/install-debian-pv-inside.sh"
+"@OPTDIR@/debug/with-vdi" ${VDI} "@OPTDIR@/debug/install-debian-pv-inside.sh"
# Start it up
xe vm-start vm=${VM}
View
2  scripts/10resetvdis
@@ -16,5 +16,5 @@ IFS=","
for i in `xe pbd-list host-uuid=$HOSTUUID --minimal`
do
SR=`xe pbd-param-get uuid=$i param-name=sr-uuid`
- "@BASE_PATH@/sm/resetvdis.py" $HOSTUUID $SR
+ "@OPTDIR@/sm/resetvdis.py" $HOSTUUID $SR
done
View
2  scripts/backup-metadata-cron
@@ -2,7 +2,7 @@
if [ -e /etc/xensource/pool.conf ]; then
if [ "$(cat /etc/xensource/pool.conf)" = "master" ]; then
- "@BASE_PATH@/bin/xe-backup-metadata" -c >/dev/null 2>&1
+ "@OPTDIR@/bin/xe-backup-metadata" -c >/dev/null 2>&1
EXITVALUE=$?
if [ $EXITVALUE != 0 ]; then
/usr/bin/logger -t backup-metadata "ALERT exited abnormally with [$EXITVALUE]"
View
4 scripts/debug_ha_query_liveset
@@ -2,8 +2,8 @@
# Run by xen-bugtool
-export PATH=$PATH:@BASE_PATH@/xha
+export PATH=$PATH:@OPTDIR@/xha
echo Running ha_query_liveset $*:
-"@BASE_PATH@/xha/ha_query_liveset" $*
+"@OPTDIR@/xha/ha_query_liveset" $*
echo Output of command: $?
View
4 scripts/examples/python/monitor-unwanted-domains.py
@@ -9,7 +9,7 @@
# Return a list of (domid, uuid) tuples, one per paused domain on this host
def list_paused_domains():
results = []
- all = subprocess.Popen(["@BASE_PATH@/bin/list_domains"], stdout=subprocess.PIPE).communicate()[0]
+ all = subprocess.Popen(["@OPTDIR@/bin/list_domains"], stdout=subprocess.PIPE).communicate()[0]
lines = all.split("\n")
for domain in lines[1:]:
bits = domain.split()
@@ -54,7 +54,7 @@ def log(str):
# Destroy the given domain
def destroy_domain((domid, uuid)):
log("destroying domid %s uuid %s" % (domid, uuid))
- all = subprocess.Popen(["@BASE_PATH@/debug/destroy_domain", "-domid", domid], stdout=subprocess.PIPE).communicate()[0]
+ all = subprocess.Popen(["@OPTDIR@/debug/destroy_domain", "-domid", domid], stdout=subprocess.PIPE).communicate()[0]
# Keep track of when a domain first looked like it should be here
domain_first_noticed = {}
View
2  scripts/fence
@@ -3,4 +3,4 @@
# Do not use the ocaml XIU stuff for this -- we want the real
# hypervisor to fence this domain.
unset XIU
-@BASE_PATH@/libexec/fence.bin $*
+@OPTDIR@/libexec/fence.bin $*
View
2  scripts/init.d-genptoken
@@ -10,7 +10,7 @@
start() {
if [ ! -f /etc/xensource/ptoken ]; then
echo -n $"Creating pool secret (this may take some time)"
- "@BASE_PATH@/libexec/genptoken" -f -o /etc/xensource/ptoken
+ "@OPTDIR@/libexec/genptoken" -f -o /etc/xensource/ptoken
[ $? -eq 0 ] && success $"Done" || failure
echo
fi
View
2  scripts/init.d-management-interface
@@ -8,7 +8,7 @@
. /etc/init.d/functions
export XENSOURCE_INVENTORY=/etc/xensource-inventory
-export INTERFACE_RECONFIGURE="@BASE_PATH@/libexec/interface-reconfigure"
+export INTERFACE_RECONFIGURE="@OPTDIR@/libexec/interface-reconfigure"
[ -r ${XENSOURCE_INVENTORY} ] || exit 0
. ${XENSOURCE_INVENTORY}
View
2  scripts/init.d-perfmon
@@ -11,7 +11,7 @@
# Source function library.
. /etc/init.d/functions
-PERFMON="@BASE_PATH@/bin/perfmon"
+PERFMON="@OPTDIR@/bin/perfmon"
PERFMON_FLAGS=
if [ -f /etc/sysconfig/perfmon ]; then
View
4 scripts/init.d-squeezed
@@ -13,7 +13,7 @@
# Memory ballooning daemon
# location of the executable:
-SQUEEZED="@BASE_PATH@/libexec/squeezed"
+SQUEEZED="@OPTDIR@/libexec/squeezed"
# pidfile:
PID_FILE="/var/run/squeezed.pid"
@@ -25,7 +25,7 @@ SUBSYS_FILE="/var/lock/subsys/squeezed"
. /etc/init.d/functions
if [ -e /var/xapi/xiu-xc ]; then
- export XENCTRL_OSDEP="@BASE_PATH@/lib/libxenctrl_xiu.so"
+ export XENCTRL_OSDEP="@OPTDIR@/lib/libxenctrl_xiu.so"
export XIU=/var/xapi/xiu
fi
View
2  scripts/init.d-v6d
@@ -13,7 +13,7 @@
# v6 licensing daemon
# location of the executable:
-V6D="@BASE_PATH@/libexec/v6d"
+V6D="@OPTDIR@/libexec/v6d"
# pidfile:
PID_FILE="/var/run/v6d.pid"
View
8 scripts/init.d-xapi
@@ -16,7 +16,7 @@ if [ -f /etc/sysconfig/xapi ]; then
fi
if [ -e /var/xapi/xiu-xc ]; then
- export XENCTRL_OSDEP="@BASE_PATH@/lib/libxenctrl_xiu.so"
+ export XENCTRL_OSDEP="@OPTDIR@/lib/libxenctrl_xiu.so"
export XIU=/var/xapi/xiu
fi
@@ -52,7 +52,7 @@ start() {
# Enable backtraces
export OCAMLRUNPARAM="b"
# Add HA scripts to the path
- PATH=$PATH:@BASE_PATH@/xha
+ PATH=$PATH:@OPTDIR@/xha
# For debugging, prevent xapi startup
if [ -e ${XAPI_BLOCK_STARTUP_COOKIE} ]; then
@@ -68,12 +68,12 @@ start() {
if [ -e ${XAPI_BOOT_TIME_INFO_UPDATED} ]; then
# clear out qemu coredumps/chroot dirs on system boot:
rm -rf /var/xen/qemu/*
- "@BASE_PATH@/bin/xapi" -daemon ${xapiflags} \
+ "@OPTDIR@/bin/xapi" -daemon ${xapiflags} \
-writereadyfile ${XAPI_STARTUP_COOKIE} -writeinitcomplete ${XAPI_INIT_COMPLETE_COOKIE} -onsystemboot
RETVAL=$?
rm -f ${XAPI_BOOT_TIME_INFO_UPDATED}
else
- "@BASE_PATH@/bin/xapi" -daemon ${xapiflags} \
+ "@OPTDIR@/bin/xapi" -daemon ${xapiflags} \
-writereadyfile ${XAPI_STARTUP_COOKIE} -writeinitcomplete ${XAPI_INIT_COMPLETE_COOKIE}
RETVAL=$?
fi
View
2  scripts/init.d-xapi-domains
@@ -6,7 +6,7 @@
# chkconfig: 345 99 00
# description: Start/stop XE VMs
-SHUTDOWN="@BASE_PATH@/libexec/shutdown"
+SHUTDOWN="@OPTDIR@/libexec/shutdown"
if [ ! -e /proc/xen/privcmd ] || \
[ ! -e /etc/xensource-inventory ] || \
View
2  scripts/init.d-xapissl
@@ -100,7 +100,7 @@ start() {
*)
CN=`mgmt_ip`;;
esac
- "@BASE_PATH@/libexec/generate_ssl_cert" ${PEMFILE} ${CN}
+ "@OPTDIR@/libexec/generate_ssl_cert" ${PEMFILE} ${CN}
fi
writeconffile
start_daemon ${STUNNEL} ${SSLCONFFILE}
View
10 scripts/init.d-xenservices
@@ -16,11 +16,11 @@
start() {
# If this domain hasn't got sufficient privileges then assume it is a domU
# and start the hypercall simulator
- "@BASE_PATH@/bin/list_domains" 2>/dev/null 1>/dev/null
+ "@OPTDIR@/bin/list_domains" 2>/dev/null 1>/dev/null
if [ $? -ne 0 ]; then
echo -n $"Starting simulator: "
rm -f /var/xapi/xiu-xc /var/xapi/xiu-xs
- "@BASE_PATH@/libexec/xiu" /var/xapi/xiu 2>/dev/null 1>/dev/null &
+ "@OPTDIR@/libexec/xiu" /var/xapi/xiu 2>/dev/null 1>/dev/null &
# wait for unix domain socket to appear
RETRIES=180
@@ -36,7 +36,7 @@ start() {
failure $"xiu"
exit 1
fi
- export XENCTRL_OSDEP="@BASE_PATH@/lib/libxenctrl_xiu.so"
+ export XENCTRL_OSDEP="@OPTDIR@/lib/libxenctrl_xiu.so"
export XIU=/var/xapi/xiu
fi
echo -n $"Starting xenstored: "
@@ -59,7 +59,7 @@ start() {
XENSTORED_ARG=""
[ ! -e /etc/xensource/xenstored-no-access-log ] || XENSTORED_ARG="--no-access-log"
[ -e /var/lib/xenstored/tdb ] && mv -f /var/lib/xenstored/tdb /var/lib/xenstored/tdb.bak
- "@BASE_PATH@/bin/xenstored" ${XENSTORED_ARG}
+ "@OPTDIR@/bin/xenstored" ${XENSTORED_ARG}
/usr/sbin/xenconsoled
[ -d /var/log/blktap ] || mkdir /var/log/blktap
@@ -72,7 +72,7 @@ start() {
xenstore-rm /vm
# start cdrommon on all physicals cdrom at startup
- for i in `find /dev/xapi/cd/ ! -type d`; do "@BASE_PATH@/libexec/cdrommon" $i; done
+ for i in `find /dev/xapi/cd/ ! -type d`; do "@OPTDIR@/libexec/cdrommon" $i; done
echo
touch /var/lock/subsys/xen;
View
32 scripts/install.sh
@@ -4,8 +4,22 @@
#
# Usage: ./install.sh <mode> <file1> .. <filen> <dest>
#
-# Assumptions:
-# - The 'base-path' script is located in the same directory.
+# Replaces the following strings:
+#
+# @OPTDIR@ -> ${OPTDIR}
+# @ETCDIR@ -> ${ETCDIR}
+# @VARDIR@ -> ...etc...
+# @VARPATCHDIR@
+# @ETCDIR@
+# @OPTDIR@
+# @PLUGINDIR@
+# @HOOKSDIR@
+# @INVENTORY@
+# @XAPICONF@
+# @LIBEXECDIR@
+# @SCRIPTSDIR@
+
+set -x
MODE=${1}
NUM_FILES=$(($#-2))
@@ -27,6 +41,16 @@ for FILE in ${FILES}; do
NEWFILE=${DEST}
fi
if file ${NEWFILE} | grep -q "text"; then
- sed -i "s!@BASE_PATH@!${BASE_PATH}!g" ${NEWFILE}
+ sed -i -e "s!@OPTDIR@!${OPTDIR}!g" \
+ -e "s!@ETCDIR@!${ETCDIR}!g" \
+ -e "s!@VARDIR@!${VARDIR}!g" \
+ -e "s!@VARPATCHDIR@!${VARPATCHDIR}!g" \
+ -e "s!@PLUGINDIR@!${PLUGINDIR}!g" \
+ -e "s!@HOOKSDIR@!${HOOKSDIR}!g" \
+ -e "s!@INVENTORY@!${INVENTORY}!g" \
+ -e "s!@XAPICONF@!${XAPICONF}!g" \
+ -e "s!@LIBEXECDIR@!${LIBEXECDIR}!g" \
+ -e "s!@SCRIPTSDIR@!${SCRIPTSDIR}!g" \
+ ${NEWFILE}
fi
-done
+done
View
2  scripts/interface-visualise
@@ -3,7 +3,7 @@
# Copyright (c) Citrix Systems 2008. All rights reserved.
#
-# Usage: ssh root@<host> @BASE_PATH@/libexec/interface-visualise > <host>-network.dot
+# Usage: ssh root@<host> @OPTDIR@/libexec/interface-visualise > <host>-network.dot
# dotty <host>-network.dot
echo "digraph G {"
View
2  scripts/license-check.py
@@ -7,7 +7,7 @@
from xml.dom import minidom
gpg_binary_path="/usr/bin/gpg"
-gpg_homedir="@BASE_PATH@/gpg"
+gpg_homedir="@OPTDIR@/gpg"
gpg_pub_keyring=gpg_homedir + "/pubring.gpg"
license_file="/etc/xensource/license"
expiry_message_name="LICENSE_EXPIRES_SOON"
View
2  scripts/mpathalert-daemon
@@ -3,7 +3,7 @@
# Multipath Alerting Daemon
# location of the executable:
-MPATHALERT="@BASE_PATH@/bin/mpathalert"
+MPATHALERT="@OPTDIR@/bin/mpathalert"
#delay in seconds between 2 consecutive alerts:
DELAY="120"
View
2  scripts/plugins/iovirt
@@ -165,7 +165,7 @@ def _get_assignments(session):
return devices
def enable_iommu(session, args):
- rc = os.system("@BASE_PATH@/libexec/xen-cmdline --set-xen iommu=1")
+ rc = os.system("@OPTDIR@/libexec/xen-cmdline --set-xen iommu=1")
return str(rc == 0)
#def list_assigned_vfs(session, args):
View
2  scripts/rewrite-management-interface
@@ -17,4 +17,4 @@ cat ${INV} | grep -v ^MANAGEMENT_INTERFACE > ${TMP}
echo "MANAGEMENT_INTERFACE='$INTF'" >> ${TMP}
mv ${TMP} ${INV}
-"@BASE_PATH@/libexec/update-mh-info" $INTF
+"@OPTDIR@/libexec/update-mh-info" $INTF
View
2  scripts/runtests
@@ -12,7 +12,7 @@ fi
IF=$1
-export PATH=$PATH:@BASE_PATH@/bin
+export PATH=$PATH:@OPTDIR@/bin
# generic stuff, necessary for xenrt too
View
2  scripts/sysconfig-perfmon
@@ -1,7 +1,7 @@
#####################################################################
# Example configuration file for perfmon. This file is read by
# /etc/init.d/perfmon and used to construct the command line
-# arguments to pass to @BASE_PATH@/bin/perfmon.
+# arguments to pass to @OPTDIR@/bin/perfmon.
# uncomment lines to enable options.
View
2  scripts/vncterm-wrapper
@@ -10,7 +10,7 @@ DOMID=$1
shift 1
#Getting the VM UUID
-export VMUUID=`"@BASE_PATH@/bin/list_domains" -domid $DOMID -minimal`
+export VMUUID=`"@OPTDIR@/bin/list_domains" -domid $DOMID -minimal`
#For security reasons, we only listen on locahost by default
export VNCTERM_LISTEN="-v 127.0.0.1:1"
View
2  scripts/xapi-rolling-upgrade-miami
@@ -8,7 +8,7 @@
set -e
. /etc/xensource-inventory
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
# Clean all unreferenced patches out of the db now that the upgrade is complete.
# When upgrading to 5.0, this should clean out all 4.1 patches at the end.
View
8 scripts/xe-backup-metadata
@@ -11,7 +11,7 @@ fi
. /etc/xensource-inventory
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
master_uuid=$(${XE} pool-list params=master --minimal)
if [ $? -gt 0 ]; then
@@ -242,7 +242,7 @@ if [ ${leave_mounted} -eq 0 ]; then
IFS=","
echo -n "Backing up SR metadata: "
mkdir -p ${metadir}
- "@BASE_PATH@/libexec/backup-sr-metadata.py" -f ${metadir}/SRMETA.xml
+ "@OPTDIR@/libexec/backup-sr-metadata.py" -f ${metadir}/SRMETA.xml
echo "done"
echo -n "Backing up VM metadata: "
@@ -255,14 +255,14 @@ if [ ${leave_mounted} -eq 0 ]; then
echo "done"
echo -n "Backing up Template metadata: "
${debug} echo ""
- template_uuids=$("@BASE_PATH@/libexec/print-custom-templates")
+ template_uuids=$("@OPTDIR@/libexec/print-custom-templates")
if [ $? -eq 0 ]; then
for tmpl_uuid in ${template_uuids}; do
${XE} template-export --metadata template-uuid=${tmpl_uuid} filename=${metadir}/all/${tmpl_uuid}.vmmeta >/dev/null 2>&1
done
fi
echo "done"
- "@BASE_PATH@/libexec/link-vms-by-sr.py" -d ${metadir}
+ "@OPTDIR@/libexec/link-vms-by-sr.py" -d ${metadir}
else
cd ${mnt}
env PS1="Mounted backup VDI on: ${mnt}\nPress ^D to exit shell and safely detach it.\n\n[\u@\h \W]\$ " bash
View
2  scripts/xe-edit-bootloader
@@ -11,7 +11,7 @@ fi
. /etc/xensource-inventory
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
device_number=
grub_conf=
View
2  scripts/xe-mount-iso-sr
@@ -19,7 +19,7 @@ fi
shift 1
OPTIONS=$*
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
UUID=$(uuidgen)
SR=$(${XE} sr-introduce name-label="Remote ISO Library on: ${LOCATION}" content-type=iso shared=true type=iso uuid=${UUID} physical-size=0)
View
2  scripts/xe-reset-networking
@@ -21,7 +21,7 @@ from optparse import OptionParser
#import XenAPI
pool_conf = '/etc/xensource/pool.conf'
-interface_reconfigure = "@BASE_PATH@/libexec/interface-reconfigure"
+interface_reconfigure = "@OPTDIR@/libexec/interface-reconfigure"
inventory_file = '/etc/xensource-inventory'
management_conf = '/etc/firstboot.d/data/management.conf'
network_reset = '/tmp/network-reset'
View
8 scripts/xe-restore-metadata
@@ -9,7 +9,7 @@ fi
. /etc/xensource-inventory
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
master_uuid=$(${XE} pool-list params=master --minimal)
if [ $? -gt 0 ]; then
@@ -170,7 +170,7 @@ for vdi_uuid in ${vdis}; do
${debug} echo ${device} >&2
${debug} echo -n "Probing device: " >&2
- probecmd="@BASE_PATH@/libexec/probe-device-for-file"
+ probecmd="@OPTDIR@/libexec/probe-device-for-file"
metadata_stamp="/.ctxs-metadata-backup"
mnt=
${probecmd} ${device} ${metadata_stamp}
@@ -287,7 +287,7 @@ for meta in *.vmmeta; do
if [ ${dry_run} -gt 0 ]; then
echo xe vm-import filename=${meta} sr-uuid=${sr_uuid} --metadata --preserve
else
- "@BASE_PATH@/bin/xe" vm-import filename="${full_dir}/${meta}" sr-uuid=${sr_uuid} --metadata --preserve
+ "@OPTDIR@/bin/xe" vm-import filename="${full_dir}/${meta}" sr-uuid=${sr_uuid} --metadata --preserve
if [ $? -gt 0 ]; then
error_count=$(( $error_count + 1 ))
else
@@ -297,7 +297,7 @@ for meta in *.vmmeta; do
done
smmeta_file=${mnt}/metadata/${chosen_metadata_dir}/SRMETA.xml
-cmd="@BASE_PATH@/libexec/restore-sr-metadata.py -u ${sr_uuid} -f ${smmeta_file}"
+cmd="@OPTDIR@/libexec/restore-sr-metadata.py -u ${sr_uuid} -f ${smmeta_file}"
if [ -e ${smmeta_file} ]; then
if [ ${dry_run} -gt 0 ]; then
echo ${cmd}
View
2  scripts/xe-set-iscsi-iqn
@@ -6,7 +6,7 @@
set -e
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
configmap="other-config"
configkey="iscsi_iqn"
View
2  scripts/xe-xentrace
@@ -37,7 +37,7 @@ fi
. /etc/xensource-inventory
-XE="@BASE_PATH@/bin/xe"
+XE="@OPTDIR@/bin/xe"
crashdump_sr=$(${XE} host-list params=crash-dump-sr-uuid --minimal uuid=${INSTALLATION_UUID})
View
322 xapi.spec.in
@@ -123,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
%files core
%defattr(-,root,root,-)
-@BASE_PATH@/bin/xapi
+@OPTDIR@/bin/xapi
/etc/xapi.conf
/etc/logrotate.d/audit
/etc/logrotate.d/v6d
@@ -173,91 +173,91 @@ rm -rf $RPM_BUILD_ROOT
/etc/xensource/scripts/tap
/etc/xensource/scripts/vif
/etc/xensource/scripts/block
-@BASE_PATH@/bin/fix_firewall.sh
-@BASE_PATH@/bin/list_domains
-@BASE_PATH@/bin/mpathalert
-@BASE_PATH@/bin/perfmon
-@BASE_PATH@/bin/static-vdis
-@BASE_PATH@/bin/v6d-reopen-logs
-@BASE_PATH@/bin/xapi-autostart-vms
-@BASE_PATH@/bin/xapi-db-process
-@BASE_PATH@/bin/xapi-wait-init-complete
-@BASE_PATH@/bin/xe-backup-metadata
-@BASE_PATH@/bin/xe-edit-bootloader
-@BASE_PATH@/bin/xe-mount-iso-sr
-@BASE_PATH@/bin/xe-restore-metadata
-@BASE_PATH@/bin/xe-reset-networking
-@BASE_PATH@/bin/xe-scsi-dev-map
-@BASE_PATH@/bin/xe-set-iscsi-iqn
-@BASE_PATH@/bin/xe-toolstack-restart
-@BASE_PATH@/bin/xe-xentrace
-@BASE_PATH@/bin/xsh
+@OPTDIR@/bin/fix_firewall.sh
+@OPTDIR@/bin/list_domains
+@OPTDIR@/bin/mpathalert
+@OPTDIR@/bin/perfmon
+@OPTDIR@/bin/static-vdis
+@OPTDIR@/bin/v6d-reopen-logs
+@OPTDIR@/bin/xapi-autostart-vms
+@OPTDIR@/bin/xapi-db-process
+@OPTDIR@/bin/xapi-wait-init-complete
+@OPTDIR@/bin/xe-backup-metadata
+@OPTDIR@/bin/xe-edit-bootloader
+@OPTDIR@/bin/xe-mount-iso-sr
+@OPTDIR@/bin/xe-restore-metadata
+@OPTDIR@/bin/xe-reset-networking
+@OPTDIR@/bin/xe-scsi-dev-map
+@OPTDIR@/bin/xe-set-iscsi-iqn
+@OPTDIR@/bin/xe-toolstack-restart
+@OPTDIR@/bin/xe-xentrace
+@OPTDIR@/bin/xsh
/etc/xensource/bugtool/xapi.xml
/etc/xensource/bugtool/xapi/stuff.xml
-@BASE_PATH@/libexec/sm_diagnostics
-@BASE_PATH@/libexec/thread_diagnostics
-@BASE_PATH@/libexec/fakeguestagent
-@BASE_PATH@/libexec/InterfaceReconfigure.py
-@BASE_PATH@/libexec/InterfaceReconfigure.pyo
-@BASE_PATH@/libexec/InterfaceReconfigure.pyc
-@BASE_PATH@/libexec/InterfaceReconfigureBridge.py
-@BASE_PATH@/libexec/InterfaceReconfigureBridge.pyo
-@BASE_PATH@/libexec/InterfaceReconfigureBridge.pyc
-@BASE_PATH@/libexec/InterfaceReconfigureVswitch.py
-@BASE_PATH@/libexec/InterfaceReconfigureVswitch.pyo
-@BASE_PATH@/libexec/InterfaceReconfigureVswitch.pyc
-@BASE_PATH@/libexec/backup-metadata-cron
-@BASE_PATH@/libexec/backup-sr-metadata.py
-@BASE_PATH@/libexec/backup-sr-metadata.pyo
-@BASE_PATH@/libexec/backup-sr-metadata.pyc
-@BASE_PATH@/libexec/block_device_io
-@BASE_PATH@/libexec/cdrommon
-@BASE_PATH@/libexec/dumpcore
-@BASE_PATH@/libexec/fence
-@BASE_PATH@/libexec/fence.bin
-@BASE_PATH@/libexec/generate_ssl_cert
-@BASE_PATH@/libexec/host-backup
-@BASE_PATH@/libexec/host-bugreport-upload
-@BASE_PATH@/libexec/host-restore
-@BASE_PATH@/libexec/interface-reconfigure
-@BASE_PATH@/libexec/interface-visualise
-@BASE_PATH@/libexec/license-check.py
-@BASE_PATH@/libexec/license-check.pyo
-@BASE_PATH@/libexec/license-check.pyc
-@BASE_PATH@/libexec/link-vms-by-sr.py
-@BASE_PATH@/libexec/link-vms-by-sr.pyo
-@BASE_PATH@/libexec/link-vms-by-sr.pyc
-@BASE_PATH@/libexec/logrotate.sh
-@BASE_PATH@/libexec/logs-download
-@BASE_PATH@/libexec/lw-force-domain-leave
-@BASE_PATH@/libexec/mail-alarm
-@BASE_PATH@/libexec/print-custom-templates
-@BASE_PATH@/libexec/probe-device-for-file
-@BASE_PATH@/libexec/genptoken
-@BASE_PATH@/libexec/qemu-dm-wrapper
-@BASE_PATH@/libexec/restore-sr-metadata.py
-@BASE_PATH@/libexec/restore-sr-metadata.pyo
-@BASE_PATH@/libexec/restore-sr-metadata.pyc
-@BASE_PATH@/libexec/rewrite-management-interface
-@BASE_PATH@/libexec/set-dom0-memory-target-from-packs
-@BASE_PATH@/libexec/set-hostname
-@BASE_PATH@/libexec/shell.py
-@BASE_PATH@/libexec/shell.pyo
-@BASE_PATH@/libexec/shell.pyc
-@BASE_PATH@/libexec/shutdown
-@BASE_PATH@/libexec/sparse_dd
-@BASE_PATH@/libexec/update-mh-info
-@BASE_PATH@/libexec/upload-wrapper
-@BASE_PATH@/libexec/vncterm-wrapper
-@BASE_PATH@/libexec/xapi-health-check
-@BASE_PATH@/libexec/xapi-rolling-upgrade
-@BASE_PATH@/libexec/xenguest
-@BASE_PATH@/libexec/xha-lc
-@BASE_PATH@/libexec/xiu
-@BASE_PATH@/lib/libxenctrl_xiu.so
-@BASE_PATH@/libexec/pci-info
-@BASE_PATH@/packages/post-install-scripts/debian-etch
-@BASE_PATH@/packages/post-install-scripts/debug
+@OPTDIR@/libexec/sm_diagnostics
+@OPTDIR@/libexec/thread_diagnostics
+@OPTDIR@/libexec/fakeguestagent
+@OPTDIR@/libexec/InterfaceReconfigure.py
+@OPTDIR@/libexec/InterfaceReconfigure.pyo
+@OPTDIR@/libexec/InterfaceReconfigure.pyc
+@OPTDIR@/libexec/InterfaceReconfigureBridge.py
+@OPTDIR@/libexec/InterfaceReconfigureBridge.pyo
+@OPTDIR@/libexec/InterfaceReconfigureBridge.pyc
+@OPTDIR@/libexec/InterfaceReconfigureVswitch.py
+@OPTDIR@/libexec/InterfaceReconfigureVswitch.pyo
+@OPTDIR@/libexec/InterfaceReconfigureVswitch.pyc
+@OPTDIR@/libexec/backup-metadata-cron
+@OPTDIR@/libexec/backup-sr-metadata.py
+@OPTDIR@/libexec/backup-sr-metadata.pyo
+@OPTDIR@/libexec/backup-sr-metadata.pyc
+@OPTDIR@/libexec/block_device_io
+@OPTDIR@/libexec/cdrommon
+@OPTDIR@/libexec/dumpcore
+@OPTDIR@/libexec/fence
+@OPTDIR@/libexec/fence.bin
+@OPTDIR@/libexec/generate_ssl_cert
+@OPTDIR@/libexec/host-backup
+@OPTDIR@/libexec/host-bugreport-upload
+@OPTDIR@/libexec/host-restore
+@OPTDIR@/libexec/interface-reconfigure
+@OPTDIR@/libexec/interface-visualise
+@OPTDIR@/libexec/license-check.py
+@OPTDIR@/libexec/license-check.pyo
+@OPTDIR@/libexec/license-check.pyc
+@OPTDIR@/libexec/link-vms-by-sr.py
+@OPTDIR@/libexec/link-vms-by-sr.pyo
+@OPTDIR@/libexec/link-vms-by-sr.pyc
+@OPTDIR@/libexec/logrotate.sh
+@OPTDIR@/libexec/logs-download
+@OPTDIR@/libexec/lw-force-domain-leave
+@OPTDIR@/libexec/mail-alarm
+@OPTDIR@/libexec/print-custom-templates
+@OPTDIR@/libexec/probe-device-for-file
+@OPTDIR@/libexec/genptoken
+@OPTDIR@/libexec/qemu-dm-wrapper
+@OPTDIR@/libexec/restore-sr-metadata.py
+@OPTDIR@/libexec/restore-sr-metadata.pyo
+@OPTDIR@/libexec/restore-sr-metadata.pyc
+@OPTDIR@/libexec/rewrite-management-interface
+@OPTDIR@/libexec/set-dom0-memory-target-from-packs
+@OPTDIR@/libexec/set-hostname
+@OPTDIR@/libexec/shell.py
+@OPTDIR@/libexec/shell.pyo
+@OPTDIR@/libexec/shell.pyc
+@OPTDIR@/libexec/shutdown
+@OPTDIR@/libexec/sparse_dd
+@OPTDIR@/libexec/update-mh-info
+@OPTDIR@/libexec/upload-wrapper
+@OPTDIR@/libexec/vncterm-wrapper
+@OPTDIR@/libexec/xapi-health-check
+@OPTDIR@/libexec/xapi-rolling-upgrade
+@OPTDIR@/libexec/xenguest
+@OPTDIR@/libexec/xha-lc
+@OPTDIR@/libexec/xiu
+@OPTDIR@/lib/libxenctrl_xiu.so
+@OPTDIR@/libexec/pci-info
+@OPTDIR@/packages/post-install-scripts/debian-etch
+@OPTDIR@/packages/post-install-scripts/debug
/usr/lib/python2.4/site-packages/XenAPI.py
/usr/lib/python2.4/site-packages/XenAPI.pyo
/usr/lib/python2.4/site-packages/XenAPI.pyc
@@ -270,110 +270,110 @@ rm -rf $RPM_BUILD_ROOT
%exclude /usr/lib/python2.4/site-packages/xen/*
%exclude /usr/lib/python2.4/site-packages/xen/lowlevel/*
/var/xapi/udhcpd.skel
-@BASE_PATH@/debug/rbac_static.csv
+@OPTDIR@/debug/rbac_static.csv
/etc/xapi.d/host-post-declare-dead/10resetvdis
%files xe
%defattr(-,root,root,-)
-@BASE_PATH@/bin/xe
-@BASE_PATH@/debug/sm
+@OPTDIR@/bin/xe
+@OPTDIR@/debug/sm
/usr/bin/xe
/etc/bash_completion.d/xe
%files squeezed
%defattr(-,root,root,-)
-@BASE_PATH@/libexec/squeezed
+@OPTDIR@/libexec/squeezed
/etc/logrotate.d/squeezed
/etc/rc.d/init.d/squeezed
-@BASE_PATH@/bin/squeezed_client
+@OPTDIR@/bin/squeezed_client
%files v6d
%defattr(-,root,root,-)
-@BASE_PATH@/libexec/v6d
+@OPTDIR@/libexec/v6d
/etc/rc.d/init.d/v6d
%files xenops
%defattr(-,root,root,-)
-@BASE_PATH@/debug/xenops
-@BASE_PATH@/debug/add_vbd
-@BASE_PATH@/debug/add_vif
-@BASE_PATH@/debug/build_domain
-@BASE_PATH@/debug/build_hvm
-@BASE_PATH@/debug/create_domain
-@BASE_PATH@/debug/debug_ha_query_liveset
-@BASE_PATH@/debug/destroy_domain
-@BASE_PATH@/debug/event_listen
-@BASE_PATH@/debug/graph
-@BASE_PATH@/debug/memory_breakdown
-@BASE_PATH@/debug/memory_summary
-@BASE_PATH@/debug/pause_domain
-@BASE_PATH@/debug/restore_domain
-@BASE_PATH@/debug/rrddump
-@BASE_PATH@/debug/shutdown_domain
-@BASE_PATH@/debug/sm_stress
-@BASE_PATH@/debug/suspend_domain
-@BASE_PATH@/debug/unpause_domain
-@BASE_PATH@/debug/vncproxy
-@BASE_PATH@/debug/with-vdi
-@BASE_PATH@/debug/xal
-@BASE_PATH@/debug/xs
+@OPTDIR@/debug/xenops
+@OPTDIR@/debug/add_vbd
+@OPTDIR@/debug/add_vif
+@OPTDIR@/debug/build_domain
+@OPTDIR@/debug/build_hvm
+@OPTDIR@/debug/create_domain
+@OPTDIR@/debug/debug_ha_query_liveset
+@OPTDIR@/debug/destroy_domain
+@OPTDIR@/debug/event_listen
+@OPTDIR@/debug/graph
+@OPTDIR@/debug/memory_breakdown
+@OPTDIR@/debug/memory_summary
+@OPTDIR@/debug/pause_domain
+@OPTDIR@/debug/restore_domain
+@OPTDIR@/debug/rrddump
+@OPTDIR@/debug/shutdown_domain
+@OPTDIR@/debug/sm_stress
+@OPTDIR@/debug/suspend_domain
+@OPTDIR@/debug/unpause_domain
+@OPTDIR@/debug/vncproxy
+@OPTDIR@/debug/with-vdi
+@OPTDIR@/debug/xal
+@OPTDIR@/debug/xs
%files www
%defattr(-,root,root,-)
-#@BASE_PATH@/debug/www/XenServerConsole.jar
-@BASE_PATH@/debug/www/api.js
-@BASE_PATH@/debug/www/apicall.css
-@BASE_PATH@/debug/www/apicall.js
-@BASE_PATH@/debug/www/construct_tree.js
-@BASE_PATH@/debug/www/devweb.css
-@BASE_PATH@/debug/www/devweb.js
-@BASE_PATH@/debug/www/editables.js
-@BASE_PATH@/debug/www/graphs.js
-@BASE_PATH@/debug/www/haplan.css
-@BASE_PATH@/debug/www/haplan.js
-@BASE_PATH@/debug/www/images/xen_logo.gif
-@BASE_PATH@/debug/www/index.html
-@BASE_PATH@/debug/www/jquery/jqDnR.css
-@BASE_PATH@/debug/www/jquery/jqDnR.js
-@BASE_PATH@/debug/www/jquery/jqModal.css
-@BASE_PATH@/debug/www/jquery/jqModal.js
-@BASE_PATH@/debug/www/jquery/jquery-1.3.2.js
-@BASE_PATH@/debug/www/jquery/jquery-dom.js
-@BASE_PATH@/debug/www/jquery/jquery.autocomplete.css
-@BASE_PATH@/debug/www/jquery/jquery.autocomplete.js
-@BASE_PATH@/debug/www/jquery/jquery.bgiframe.js
-@BASE_PATH@/debug/www/jquery/jquery.color.js
-@BASE_PATH@/debug/www/jquery/jquery.cookie.js
-@BASE_PATH@/debug/www/jquery/jquery.jeditable.js
-@BASE_PATH@/debug/www/jquery/jquery.rpc.js
-@BASE_PATH@/debug/www/jquery/jquery.treeview.js
-@BASE_PATH@/debug/www/main.js
-@BASE_PATH@/debug/www/messages.js
-@BASE_PATH@/debug/www/networks.css
-@BASE_PATH@/debug/www/networks.js
-@BASE_PATH@/debug/www/objectviewoverrides.js
-@BASE_PATH@/debug/www/offline.js
-@BASE_PATH@/debug/www/process_rrd.js
-@BASE_PATH@/debug/www/tree.css
-@BASE_PATH@/debug/www/vmsearch.js
-@BASE_PATH@/debug/www/xenapi.js
+#@OPTDIR@/debug/www/XenServerConsole.jar
+@OPTDIR@/debug/www/api.js
+@OPTDIR@/debug/www/apicall.css
+@OPTDIR@/debug/www/apicall.js
+@OPTDIR@/debug/www/construct_tree.js
+@OPTDIR@/debug/www/devweb.css
+@OPTDIR@/debug/www/devweb.js
+@OPTDIR@/debug/www/editables.js
+@OPTDIR@/debug/www/graphs.js
+@OPTDIR@/debug/www/haplan.css
+@OPTDIR@/debug/www/haplan.js
+@OPTDIR@/debug/www/images/xen_logo.gif
+@OPTDIR@/debug/www/index.html
+@OPTDIR@/debug/www/jquery/jqDnR.css
+@OPTDIR@/debug/www/jquery/jqDnR.js
+@OPTDIR@/debug/www/jquery/jqModal.css
+@OPTDIR@/debug/www/jquery/jqModal.js
+@OPTDIR@/debug/www/jquery/jquery-1.3.2.js
+@OPTDIR@/debug/www/jquery/jquery-dom.js
+@OPTDIR@/debug/www/jquery/jquery.autocomplete.css
+@OPTDIR@/debug/www/jquery/jquery.autocomplete.js
+@OPTDIR@/debug/www/jquery/jquery.bgiframe.js
+@OPTDIR@/debug/www/jquery/jquery.color.js
+@OPTDIR@/debug/www/jquery/jquery.cookie.js
+@OPTDIR@/debug/www/jquery/jquery.jeditable.js
+@OPTDIR@/debug/www/jquery/jquery.rpc.js
+@OPTDIR@/debug/www/jquery/jquery.treeview.js
+@OPTDIR@/debug/www/main.js
+@OPTDIR@/debug/www/messages.js
+@OPTDIR@/debug/www/networks.css
+@OPTDIR@/debug/www/networks.js
+@OPTDIR@/debug/www/objectviewoverrides.js
+@OPTDIR@/debug/www/offline.js
+@OPTDIR@/debug/www/process_rrd.js
+@OPTDIR@/debug/www/tree.css
+@OPTDIR@/debug/www/vmsearch.js
+@OPTDIR@/debug/www/xenapi.js
%files tests
%defattr(-,root,root,-)
/etc/xapi.d/plugins/lvhdrt-helper
/etc/xapi.d/plugins/lvhdrt-trash-vdi
/etc/xapi.d/plugins/multipathrt-helper
-@BASE_PATH@/debug/cli-rt-domu-shar.sh
-@BASE_PATH@/debug/cli_test
-@BASE_PATH@/debug/install-debian-pv-inside.sh
-@BASE_PATH@/debug/install-debian-pv.sh
-@BASE_PATH@/debug/lvhdrt
-@BASE_PATH@/debug/multipathrt
-@BASE_PATH@/debug/myfirstpatch.asc
-@BASE_PATH@/debug/perftest
-@BASE_PATH@/debug/quicktest
-@BASE_PATH@/debug/quicktestbin
-@BASE_PATH@/debug/watch_test
+@OPTDIR@/debug/cli-rt-domu-shar.sh
+@OPTDIR@/debug/cli_test
+@OPTDIR@/debug/install-debian-pv-inside.sh
+@OPTDIR@/debug/install-debian-pv.sh
+@OPTDIR@/debug/lvhdrt
+@OPTDIR@/debug/multipathrt
+@OPTDIR@/debug/myfirstpatch.asc
+@OPTDIR@/debug/perftest
+@OPTDIR@/debug/quicktest
+@OPTDIR@/debug/quicktestbin
+@OPTDIR@/debug/watch_test
/cli-rt/*
/etc/xapi.d/plugins/monitor_fake_plugin
Please sign in to comment.
Something went wrong with that request. Please try again.