git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
appliance: udev-174 moves udevd to /lib/udev/udevd (instead of /sbin/udevd)
[libguestfs.git]
/
daemon
/
scrub.c
diff --git
a/daemon/scrub.c
b/daemon/scrub.c
index
e37a1e1
..
573385f
100644
(file)
--- a/
daemon/scrub.c
+++ b/
daemon/scrub.c
@@
-31,8
+31,7
@@
int
optgroup_scrub_available (void)
{
int
optgroup_scrub_available (void)
{
- int r = access ("/usr/bin/scrub", X_OK);
- return r == 0;
+ return prog_exists ("scrub");
}
int
}
int
@@
-43,7
+42,7
@@
do_scrub_device (const char *device)
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
r = command (NULL, &err, "scrub", device, NULL);
if (r == -1) {
- reply_with_error ("
scrub_device:
%s: %s", device, err);
+ reply_with_error ("%s: %s", device, err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-70,7
+69,7
@@
do_scrub_file (const char *file)
r = command (NULL, &err, "scrub", "-r", buf, NULL);
free (buf);
if (r == -1) {
r = command (NULL, &err, "scrub", "-r", buf, NULL);
free (buf);
if (r == -1) {
- reply_with_error ("
scrub_file:
%s: %s", file, err);
+ reply_with_error ("%s: %s", file, err);
free (err);
return -1;
}
free (err);
return -1;
}
@@
-97,7
+96,7
@@
do_scrub_freespace (const char *dir)
r = command (NULL, &err, "scrub", "-X", buf, NULL);
free (buf);
if (r == -1) {
r = command (NULL, &err, "scrub", "-X", buf, NULL);
free (buf);
if (r == -1) {
- reply_with_error ("
scrub_freespace:
%s: %s", dir, err);
+ reply_with_error ("%s: %s", dir, err);
free (err);
return -1;
}
free (err);
return -1;
}