Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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.
This commit is contained in:
Brian Behlendorf 2011-07-06 11:36:54 -07:00
parent b1c932d318
commit 341b5f1d4c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ztest/ztest.c
View File

@ -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");