From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 6 Jul 2011 18:36:54 +0000 (-0700)
Subject: Update ztest paths
X-Git-Tag: zfs-0.6.0-rc5~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=341b5f1d4c03c0f318218346154e2fb79a8acb92;p=zfs

Update ztest paths

Unfortunately, ztest is hard coded to export the zdb utility to
be installed in a certain location.  When the packaging was updated
to install zdb in /sbin/ ztest was broken.  To fix this I'm updating
ztest to check both common install paths.
---

diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c
index f71053476..6acba5290 100644
--- a/cmd/ztest/ztest.c
+++ b/cmd/ztest/ztest.c
@@ -4910,8 +4910,10 @@ ztest_run_zdb(char *pool)
 	zbuf = umem_alloc(1024, UMEM_NOFAIL);
 
 	VERIFY(realpath(getexecname(), bin) != NULL);
-	if (strncmp(bin, "/usr/sbin/ztest", 14) == 0) {
+	if (strncmp(bin, "/usr/sbin/ztest", 15) == 0) {
 		strcpy(bin, "/usr/sbin/zdb"); /* Installed */
+	} else if (strncmp(bin, "/sbin/ztest", 11) == 0) {
+		strcpy(bin, "/sbin/zdb"); /* Installed */
 	} else {
 		strstr(bin, "/ztest/")[0] = '\0'; /* In-tree */
 		strcat(bin, "/zdb/zdb");