git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix 'unknown filesystem' warnings in old inspection code (RHBZ#678231 RHBZ#666578).
[libguestfs.git]
/
daemon
/
zerofree.c
diff --git
a/daemon/zerofree.c
b/daemon/zerofree.c
index
05a547b
..
f98c69b
100644
(file)
--- a/
daemon/zerofree.c
+++ b/
daemon/zerofree.c
@@
-31,8
+31,7
@@
int
optgroup_zerofree_available (void)
{
int
optgroup_zerofree_available (void)
{
- int r = access ("/usr/sbin/zerofree", X_OK);
- return r == 0;
+ return prog_exists ("zerofree");
}
int
}
int
@@
-41,9
+40,9
@@
do_zerofree (const char *device)
char *err;
int r;
char *err;
int r;
- r = command (NULL, &err, "
/usr/sbin/
zerofree", device, NULL);
+ r = command (NULL, &err, "zerofree", device, NULL);
if (r == -1) {
if (r == -1) {
- reply_with_error ("
zerofree:
%s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (err);
return -1;
}
free (err);
return -1;
}