Added auto-generated config_constants.ml, and made use of it.

Updated getters for: tools_sr_dir, logrot_cmd, startup_script_hook, rolling_upgrade_script_hook, xapi_message_script, lw_force_domain_leave_script, xe_path, sm_dir, find_partition_path, iso_path, sparse_dd_path, upload_wrapper, host_backup, host_restore, pci-info, udhcpd, (in ocaml/xapi/xapi_ha.ml), tapdisk_cache_stats, www, rewrite_management_interface, block_device_io, gpg_homedir, c_rehash, demo_xgt_dir, post_install_dir, dump_core, static_vdis, qemu_dm_wrapper, host_bugreport_upload, set_hostname, logs-download, update_upload_pre_script, update_upload_post_script, xsh, allowed_dom0_directory_for_provision_scripts, vncterm_wrapper, pci_flr, xenguest, bin_path. Removed Constants.fix_firewall_script, since it's not used anywhere. Moved xapi.conf from /etc/xensource to /etc. Changes to Makefiles and OMakefile-s: - Made use of base_path within OMakefiles. - Made use of LIBEXEC variable in all OMakefile-s. - Renamed BASE_DIR to BASE_PATH in OMakefiles. - Created a convenient BIN_DIR OMake variable. - Removed unneeded trailing slashes. Signed-of-by: Rok Strnisa <rok.strnisa@citrix.com>
xapi-project · Jul 14, 2011 · e696eb8 · e696eb8
1 parent 1fca4e2
commit e696eb8
Show file tree

Hide file tree

Showing 64 changed files with 209 additions and 182 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,6 +45,7 @@ ocaml/idl/xen*api.pdf
 ocaml/stdlib2/t*.ml
 ocaml/auth/testauthx
 ocaml/xapi/at_least_once_more
+ocaml/xapi/config_constants.ml
 ocaml/xapi/storage_interface.mli
 js/devweb/api.js
 ocaml/util/pciutil

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ RPMBUILD?=rpmbuild
 XEN_RELEASE?=unknown
 endif
 
-BASE_PATH=$(shell scripts/base_path scripts/xapi.conf)
+BASE_PATH=$(shell scripts/base-path scripts/xapi.conf)
 
 JQUERY=$(CARBON_DISTFILES)/javascript/jquery/jquery-1.1.3.1.pack.js
 JQUERY_TREEVIEW=$(CARBON_DISTFILES)/javascript/jquery/treeview/jquery.treeview.zip
@@ -56,7 +56,7 @@ clean:
 	omake clean
 	omake lib-uninstall
 	rm -rf dist/staging
-	rm -f .omakedb .omakedb.lock
+	rm -f .omakedb .omakedb.lock xapi.spec
 
 .PHONY: otags
 otags:

diff --git a/OMakefile b/OMakefile
@@ -49,8 +49,12 @@ XEN_OCAML_CLIBS=
 CFLAGS+=-I$(shell ocamlc -where)
 
 DESTDIR=$(getenv DESTDIR, $(ROOT)/dist/staging)
-DEBUGDIST=$(DESTDIR)/opt/xensource/debug
-LIBEXEC=$(DESTDIR)/opt/xensource/libexec
+RAW_BASE_PATH=$(shell scripts/base-path scripts/xapi.conf)
+BASE_PATH=$(DESTDIR)$(RAW_BASE_PATH)
+BIN_DIR=$(RAW_BASE_PATH)/bin
+BIN_PATH=$(DESTDIR)$(BIN_DIR)
+DEBUGDIST=$(BASE_PATH)/debug
+LIBEXEC=$(BASE_PATH)/libexec
 
 DIST=$(ROOT)/dist
 SDK=$(DESTDIR)/usr/share/doc/xapi
@@ -79,7 +83,7 @@ export
 .PHONY: none
 
 # Ocaml #############################################################################
-OCAML_PHASE1= autogen_idl
+OCAML_PHASE1= generate_constants autogen_idl
 OCAML_PHASE2= $(if $(BYTE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cma) $(if $(NATIVE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cmxa)
 
 # JS ################################################################################

diff --git a/ocaml/auth/OMakefile b/ocaml/auth/OMakefile
@@ -17,4 +17,4 @@ clean:
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(BIN_PATH)
diff --git a/ocaml/auth/extauth.ml b/ocaml/auth/extauth.ml
@@ -102,7 +102,7 @@ let can_execute_extauth_hook_script ~__context host event_name =
 (* use the generic call below to avoid concurrency problems between the script and host.{enable,disable}_extauth *)
 let call_extauth_hook_script_in_host_wrapper ~__context host event_name ~call_plugin_fn =
 	(* CP-709: call extauth-hook-script *)
-	(* Forkhelpers.execute_command_get_output hook-script "/opt/xensource/bin/external-auth-hook-script" *)
+	(* Forkhelpers.execute_command_get_output hook-script "/etc/xapi.d/plugins/extauth-hook" *)
 	(* fork a new thread and call new xapi.host.call-subject-add-hook-script method *)
 	(* see xapi_sync.ml *)
 	(* host.call-plugins scriptname (calls /etc/xapi.d/plugins/scriptname*)

diff --git a/ocaml/auth/extauth_plugin_ADlikewise.ml b/ocaml/auth/extauth_plugin_ADlikewise.ml
@@ -700,8 +700,8 @@ let on_disable config_params =
 	debug "Doing a manual Likewise domain-leave cleanup...";
 	(* When likewise raises an exception during domain-leave, we try again, using *)
 	(* some of the command-line workarounds that Kyle describes in CA-27627: *)
-	let lw_force_domain_leave_script = "/opt/xensource/libexec/lw-force-domain-leave" in 
-	(try 
+	let lw_force_domain_leave_script = Xapi_globs.base_path ^ "/libexec/lw-force-domain-leave" in
+	(try
 		let output, stderr = Forkhelpers.execute_command_get_output lw_force_domain_leave_script [] in
 		debug "execute %s: stdout=[%s],stderr=[%s]" lw_force_domain_leave_script (Stringext.String.replace "\n" ";" output) (Stringext.String.replace "\n" ";" stderr)
 	with e-> (debug "exception executing %s: %s" lw_force_domain_leave_script (ExnHelper.string_of_exn e);)

diff --git a/ocaml/autogen/OMakefile b/ocaml/autogen/OMakefile
@@ -20,5 +20,5 @@ api_docs: custom_actions_doc
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/debug
-	$(IPROG) rbac_static.csv $(DESTDIR)/opt/xensource/debug
+	mkdir -p $(BASE_PATH)/debug
+	$(IPROG) rbac_static.csv $(BASE_PATH)/debug
diff --git a/ocaml/cdrommon/OMakefile b/ocaml/cdrommon/OMakefile
@@ -1,11 +1,13 @@
+OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common
+OCAMLINCLUDES = ../xapi
 OCAMLPACKS += unix cdrom
 
 OCamlProgram(cdrommon, cdrommon)
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/libexec
-	cp -f cdrommon $(DESTDIR)/opt/xensource/libexec
+	mkdir -p $(LIBEXEC)
+	cp -f cdrommon $(LIBEXEC)
 
 .PHONY: clean
 clean:

diff --git a/ocaml/cdrommon/cdrommon.ml b/ocaml/cdrommon/cdrommon.ml
@@ -14,7 +14,7 @@
 let oldnotify = ref false
 
 let disc_inserted name =
-	let args = [| "/opt/xensource/bin/xe"; "host-notify"; "type=cdrom"; "params=inserted:" ^ name |] in
+	let args = [| Xapi_globs.xe_path; "host-notify"; "type=cdrom"; "params=inserted:" ^ name |] in
 	let ret = Unixext.spawnvp args.(0) args in
 	(* check if we got an error, and record the fact *)
 	begin match ret with

diff --git a/ocaml/database/OMakefile b/ocaml/database/OMakefile
@@ -13,7 +13,7 @@ OCamlProgram(unit_test_sql, unit_test_sql)
 BLOCK_DEVICE_IO_FILES = \
 	block_device_io_errors \
 	block_device_io \
-	../xapi/xapi_globs ../idl/ocaml_backend/ref \
+	../xapi/config_constants ../xapi/xapi_globs ../idl/ocaml_backend/ref \
 	../xapi/helper_process ../xapi/helper_hostname ../idl/api_errors
 
 OCamlProgram(block_device_io, $(BLOCK_DEVICE_IO_FILES))

diff --git a/ocaml/database/redo_log.ml b/ocaml/database/redo_log.ml
@@ -197,7 +197,7 @@ let string_to_redo_log_entry str =
 exception RedoLogFailure of string
 exception CommunicationsProblem of string
 
-let prog = "/opt/xensource/libexec/block_device_io"
+let prog = Xapi_globs.base_path ^ "/libexec/block_device_io"
 
 let generation_size = 16
 let length_size = 16

diff --git a/ocaml/db_process/OMakefile b/ocaml/db_process/OMakefile
@@ -7,8 +7,8 @@ OCamlProgram(xapi-db-process, xapi_db_process)
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/bin
-	cp -f xapi-db-process $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(BIN_PATH)
+	cp -f xapi-db-process $(BIN_PATH)
 
 .PHONY: sdk-install
 sdk-install: install

diff --git a/ocaml/gpg/gpg.ml b/ocaml/gpg/gpg.ml
@@ -23,8 +23,8 @@ open D
 let filename = ref ""
 
 let gpg_binary_path = "/usr/bin/gpg"
-let gpg_homedir = "/opt/xensource/gpg/"
-let gpg_pub_keyring = gpg_homedir^"pubring.gpg"
+let gpg_homedir = Xapi_globs.base_path ^ "/gpg/"
+let gpg_pub_keyring = gpg_homedir ^ "pubring.gpg"
 let allowed_gpg_checksum =
 	[ "be00ee82bffad791edfba477508d5d84"; (* centos52 version *)
 	  "a267af68c53f5d998b982235bbccb01e"; (* centos53/54 version *)

diff --git a/ocaml/idl/constants.ml b/ocaml/idl/constants.ml
@@ -59,9 +59,6 @@ let hvm_boot_params_order = "order"
 (* Key we put in VM.other_config when we upgrade a VM from Zurich/Geneva to Rio *)
 let vm_upgrade_time = "upgraded at"
 
-(* Name of the script to execute to fix the firewall for the guest installer network *)
-let fix_firewall_script = "/opt/xensource/bin/fix_firewall.sh"
-
 (* Keys in the local config database *)
 let ha_armed = "ha.armed"
 let ha_disable_failover_decisions = "ha.disable_failover_decisions"

diff --git a/ocaml/idl/ocaml_backend/OMakefile b/ocaml/idl/ocaml_backend/OMakefile
@@ -52,7 +52,7 @@ autogen_idl: $(AUTOGEN_DIR)/client.ml $(AUTOGEN_DIR)/aPI.ml $(AUTOGEN_DIR)/serve
 
 COMMON_OBJS = ref \
 	../datamodel_types xMLRPC event_types \
-	../api_errors ../api_messages ../../xapi/xapi_globs \
+	../api_errors ../api_messages ../../xapi/config_constants ../../xapi/xapi_globs \
 	../constants
 CLIENT_OBJS = xmlrpcclient rpc_client $(AUTOGEN_DIR)/aPI $(AUTOGEN_DIR)/client event_helper
 SERVER_OBJS = ../../database/escaping locking_helpers \

diff --git a/ocaml/idl/ocaml_backend/logdodgyexceptionspatch b/ocaml/idl/ocaml_backend/logdodgyexceptionspatch
@@ -9,7 +9,7 @@ To see the output, you must also comment out the line
 
 log = debug;dispatcher;nil
 
-in /etc/xensource/xapi.conf on the server.
+in /etc/xapi.conf on the server.
 
 diff -r cfceb249cbfd -r 212dd2e2b166 ocaml/idl/ocaml_backend/gen_server.ml
 --- a/ocaml/idl/ocaml_backend/gen_server.ml	Tue Nov 13 10:33:34 2007 +0000

diff --git a/ocaml/license/OMakefile b/ocaml/license/OMakefile
@@ -24,8 +24,8 @@ OCamlProgram(v6d-reopen-logs, v6d_reopen_logs)
 install: $(V6D)
 	mkdir -p $(LIBEXEC)
 	$(IPROG) $(V6D) $(LIBEXEC)
-	mkdir -p $(DESTDIR)/opt/xensource/bin
-	$(IPROG) v6d-reopen-logs $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(BIN_PATH)
+	$(IPROG) v6d-reopen-logs $(BIN_PATH)
 
 .PHONY: clean
 clean:

diff --git a/ocaml/lvhdrt/OMakefile b/ocaml/lvhdrt/OMakefile
@@ -1,5 +1,5 @@
 OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common ../idl/ocaml_backend/client
-OCAMLINCLUDES = ../idl/ocaml_backend/ ../idl ../autogen
+OCAMLINCLUDES = ../xapi ../idl/ocaml_backend/ ../idl ../autogen
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr log
 
 IEXE=install -m 755

diff --git a/ocaml/lvhdrt/utils.ml b/ocaml/lvhdrt/utils.ml
@@ -205,7 +205,7 @@ let with_sacrificial_vm rpc session f =
 	let cli_cmd args =
 		debug "$ xe %s" (String.concat " " args);
 		try
-			let output = Stringext.String.rtrim (fst(Forkhelpers.execute_command_get_output "/opt/xensource/bin/xe" args)) in
+			let output = Stringext.String.rtrim (fst(Forkhelpers.execute_command_get_output Xapi_globs.xe_path args)) in
 			debug "%s" output;
 			output
 		with

diff --git a/ocaml/mpathalert/OMakefile b/ocaml/mpathalert/OMakefile
@@ -12,6 +12,6 @@ clean:
 
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/bin
-	$(IPROG) mpathalert $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(BIN_PATH)
+	$(IPROG) mpathalert $(BIN_PATH)
 
diff --git a/ocaml/toplevel/OMakefile b/ocaml/toplevel/OMakefile
@@ -1,11 +1,11 @@
-OCAML_LIBS    = ../idl/ocaml_backend/common ../idl/ocaml_backend/client /opt/xensource/lib/ocaml/toplevellib
+OCAML_LIBS    = ../idl/ocaml_backend/common ../idl/ocaml_backend/client $(BASE_PATH)/lib/ocaml/toplevellib
 OCAMLINCLUDES = ../idl/ocaml_backend/
 OCAMLPACKS    = xml-light2 stdext uuid
 
 COMPILE_NATIVE=no
 section
 	OCAMLFLAGS+=-linkall
-	OCamlProgram(xencaml-bin, toplevelhelper /opt/xensource/lib/ocaml/topstart )
+	OCamlProgram(xencaml-bin, toplevelhelper $(BASE_PATH)/lib/ocaml/topstart )
 
 .PHONY: clean
 

diff --git a/ocaml/xapi/OMakefile b/ocaml/xapi/OMakefile
@@ -274,24 +274,32 @@ OCamlProgram(at_least_once_more, at_least_once_more at_least_once_more_test)
 
 .DEFAULT: xapi
 
+.PHONY: generate_constants
+
+generate_constants: config_constants.ml
+
+config_constants.ml: config_constants.ml.in
+	sed "s!<BASE_PATH>!\"$(RAW_BASE_PATH)\"!" $< > $@
+
 .PHONY: install
 install:
-	mkdir -p $(DESTDIR)/opt/xensource/bin
-	cp -f xapi $(DESTDIR)/opt/xensource/bin
+	mkdir -p $(BIN_PATH)
+	cp -f xapi $(BIN_PATH)
 	mkdir -p $(DEBUGDIST)
 	$(IPROG) quicktest $(DEBUGDIST)
 	cp -f quicktestbin $(DEBUGDIST)
 	$(IPROG) rrddump $(DEBUGDIST)
-	mkdir -p $(DESTDIR)/opt/xensource/libexec
-	$(IPROG) sparse_dd $(DESTDIR)/opt/xensource/libexec
+	mkdir -p $(LIBEXEC)
+	$(IPROG) sparse_dd $(LIBEXEC)
 	mkdir -p $(DESTDIR)/etc/xapi.d/plugins
 	$(IPROG) monitor_fake_plugin $(DESTDIR)/etc/xapi.d/plugins
 
 .PHONY: sdk-install
 sdk-install: install
-	mkdir -p $(DESTDIR)/opt/xensource/libexec
-	cp fakeguestagent $(DESTDIR)/opt/xensource/libexec/
+	mkdir -p $(LIBEXEC)
+	cp fakeguestagent $(LIBEXEC)/
 
 .PHONY: clean
 clean:
 	rm -rf $(CLEAN_OBJS) *.aux *.log *.fig xapi
+	rm -f config_constants.ml
diff --git a/ocaml/xapi/certificates.ml b/ocaml/xapi/certificates.ml
@@ -24,7 +24,7 @@ module D=Debug.Debugger(struct let name="certificates" end)
 open D
 
 let server_cert = "/etc/xensource/xapi-ssl.pem"
-let c_rehash = "/opt/xensource/libexec/c_rehash"
+let c_rehash = Xapi_globs.base_path ^ "/libexec/c_rehash"
 let pem_certificate_header = "-----BEGIN CERTIFICATE-----"
 let pem_certificate_footer = "-----END CERTIFICATE-----"
 

diff --git a/ocaml/xapi/config_constants.ml.in b/ocaml/xapi/config_constants.ml.in
@@ -0,0 +1 @@
+let base_path = <BASE_PATH>
diff --git a/ocaml/xapi/create_templates.ml b/ocaml/xapi/create_templates.ml
@@ -278,8 +278,8 @@ let sdk_install_template =
 
 (* Demonstration templates ---------------------------------------------------*)
 
-let demo_xgt_dir   = "/opt/xensource/packages/xgt/"
-let post_install_dir = "/opt/xensource/packages/post-install-scripts/"
+let demo_xgt_dir = Xapi_globs.base_path ^ "/packages/xgt/"
+let post_install_dir = Xapi_globs.base_path ^ "/packages/post-install-scripts/"
 
 let demo_xgt_template rpc session_id name_label short_name_label demo_xgt_name post_install_script =
 	let script = post_install_dir ^ post_install_script in

diff --git a/ocaml/xapi/db_gc.ml b/ocaml/xapi/db_gc.ml
@@ -364,11 +364,12 @@ let detect_rolling_upgrade ~__context =
 						 List.iter (fun vm -> Xapi_vm_lifecycle.update_allowed_operations ~__context ~self:vm) (Db.VM.get_all ~__context)
 					 end);
 					(* Call out to an external script to allow external actions to be performed *)
-					if (try Unix.access Xapi_globs.rolling_upgrade_script_hook [ Unix.X_OK ]; true with _ -> false) then begin
+					let rolling_upgrade_script_hook = Xapi_globs.rolling_upgrade_script_hook in
+					if (try Unix.access rolling_upgrade_script_hook [ Unix.X_OK ]; true with _ -> false) then begin
 						let args = if actually_in_progress then [ "start" ] else [ "stop" ] in
 						debug "Executing rolling_upgrade script: %s %s"
-							Xapi_globs.rolling_upgrade_script_hook (String.concat " " args);
-						ignore(Forkhelpers.execute_command_get_output Xapi_globs.rolling_upgrade_script_hook args)
+							rolling_upgrade_script_hook (String.concat " " args);
+						ignore(Forkhelpers.execute_command_get_output rolling_upgrade_script_hook args)
 					end;
 					(* Call in to internal xapi upgrade code *)
 					if actually_in_progress

diff --git a/ocaml/xapi/dbsync_master.ml b/ocaml/xapi/dbsync_master.ml
@@ -180,7 +180,7 @@ let create_tools_sr __context =
       create_magic_sr Xapi_globs.miami_tools_sr_name
 	"XenServer Tools ISOs"
 	"iso" "iso"
-	["location",Xapi_globs.tools_sr_dir; "legacy_mode", "true"]
+	["location", Xapi_globs.tools_sr_dir; "legacy_mode", "true"]
 	[Xapi_globs.xensource_internal, "true";
 	 Xapi_globs.tools_sr_tag, "true";
 	 Xapi_globs.i18n_key, "xenserver-tools";

diff --git a/ocaml/xapi/events.ml b/ocaml/xapi/events.ml
@@ -47,7 +47,7 @@ module Crashdump = struct
   let to_file domid filename =
 	if true then (
 		(* opensource version *)
-		let path = "/opt/xensource/libexec/dumpcore" in
+		let path = Xapi_globs.base_path ^ "/libexec/dumpcore" in
 		let args = [ "-domid"; string_of_int domid;
 		              "-file"; filename ] in
 		let pid = Forkhelpers.safe_close_and_exec None None None [] path args in

diff --git a/ocaml/xapi/helpers.ml b/ocaml/xapi/helpers.ml
@@ -657,9 +657,11 @@ let on_oem ~__context =
 
 exception File_doesnt_exist of string
 
+let find_partition_path = Xapi_globs.base_path ^ "/libexec/find-partition"
+
 let find_secondary_partition () =
 	try
-		let other_partition,_ = Forkhelpers.execute_command_get_output "/opt/xensource/libexec/find-partition" ["-p"; "alternate"] in
+		let other_partition,_ = Forkhelpers.execute_command_get_output find_partition_path ["-p"; "alternate"] in
 		(* Sanity check: does it exist? *)
 		let () =
 			if not (Sys.file_exists other_partition)

diff --git a/ocaml/xapi/monitor.ml b/ocaml/xapi/monitor.ml
@@ -461,11 +461,13 @@ let set_cache_sr sr_uuid =
 let unset_cache_sr () =
 	Mutex.execute cache_sr_lock (fun () -> cache_sr_uuid := None)
 
+let tapdisk_cache_stats = Xapi_globs.base_path ^ "/bin/tapdisk-cache-stats"
+
 let read_cache_stats timestamp =
 	let cache_sr_opt = Mutex.execute cache_sr_lock (fun () -> !cache_sr_uuid) in
 
 	let do_read cache_sr =
-		let (cache_stats_out,err) = Forkhelpers.execute_command_get_output "/opt/xensource/bin/tapdisk-cache-stats" [cache_sr] in
+		let (cache_stats_out,err) = Forkhelpers.execute_command_get_output tapdisk_cache_stats [cache_sr] in
 		let assoc_list = 
 			List.filter_map (fun line -> try 
 				begin match String.split '=' line with

diff --git a/ocaml/xapi/nm.ml b/ocaml/xapi/nm.ml
@@ -21,8 +21,6 @@ let local_m = Mutex.create ()
 
 let with_local_lock f = Mutex.execute local_m f
 
-let interface_reconfigure_script = "/opt/xensource/libexec/interface-reconfigure"
-
 let is_dom0_interface pif_r = pif_r.API.pIF_ip_configuration_mode <> `None
 
 (* Make sure inventory file has all current interfaces on the local host, so
@@ -39,8 +37,10 @@ let update_inventory ~__context =
 	let bridges = List.map (fun (_, pif_r) -> Db.Network.get_bridge ~__context ~self:pif_r.API.pIF_network) pifs in
 	Xapi_inventory.update Xapi_inventory._current_interfaces (String.concat " " bridges)
 
+let interface_reconfigure_script = Xapi_globs.base_path ^ "/libexec/interface-reconfigure"
+
 (* Call the interface reconfigure script. For development ignore the exn if it doesn't exist *)
-let reconfigure_pif ~__context (pif: API.ref_PIF) args = 
+let reconfigure_pif ~__context (pif: API.ref_PIF) args =
 	try
 		Helpers.call_api_functions ~__context (fun _ session_id ->
 			let args = "--session" :: (Ref.string_of session_id) :: "--pif" :: (Ref.string_of pif) :: args in

diff --git a/ocaml/xapi/quicktest_common.ml b/ocaml/xapi/quicktest_common.ml
@@ -183,7 +183,7 @@ let find_template session_id startswith =
 let cli_cmd test args = 
   debug test (String.concat " " ("$ xe" :: args));
   try
-    let output = String.rtrim (fst(Forkhelpers.execute_command_get_output "/opt/xensource/bin/xe" args)) in
+    let output = String.rtrim (fst(Forkhelpers.execute_command_get_output Xapi_globs.xe_path args)) in
     debug test output;
     output
   with