Remove python c_rehash in favour of using the perl one that is distri…

…buted with openssl Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
xapi-project · Nov 16, 2011 · ed53743 · ed53743
1 parent 35f572a
commit ed53743
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 255 deletions.
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 = Xapi_globs.base_path ^ "/libexec/c_rehash"
+let c_rehash = "/usr/bin/c_rehash"
 let pem_certificate_header = "-----BEGIN CERTIFICATE-----"
 let pem_certificate_footer = "-----END CERTIFICATE-----"
 

diff --git a/scripts/OMakefile b/scripts/OMakefile
@@ -95,7 +95,6 @@ install:
 	$(IPROG) restore-sr-metadata.py $(LIBEXEC)
 	$(IPROG) probe-device-for-file $(LIBEXEC)
 	$(IPROG) backup-metadata-cron $(LIBEXEC)
-	$(IPROG) c_rehash $(LIBEXEC)
 	$(IPROG) lw-force-domain-leave $(LIBEXEC)
 	$(IPROG) init.d-perfmon $(DESTDIR)/etc/rc.d/init.d/perfmon
 	mkdir -p $(DESTDIR)/etc/sysconfig

diff --git a/scripts/c_rehash b/scripts/c_rehash
diff --git a/xapi.spec.in b/xapi.spec.in
@@ -210,7 +210,6 @@ rm -rf $RPM_BUILD_ROOT
 @BASE_PATH@/libexec/backup-sr-metadata.pyo
 @BASE_PATH@/libexec/backup-sr-metadata.pyc
 @BASE_PATH@/libexec/block_device_io
-@BASE_PATH@/libexec/c_rehash
 @BASE_PATH@/libexec/cdrommon
 @BASE_PATH@/libexec/dumpcore
 @BASE_PATH@/libexec/fence