Allow aug-ls to take Augeas variable as argument (RHBZ#580016).

[libguestfs.git] / daemon / sfdisk.c

diff --git a/daemon/sfdisk.c b/daemon/sfdisk.c
index 6d49387..20d7dc8 100644 (file)
--- a/daemon/sfdisk.c
+++ b/daemon/sfdisk.c
@@ -38,7 +38,7 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
   char buf[256];
   int i;
 
-  strcpy (buf, "/sbin/sfdisk");
+  strcpy (buf, "sfdisk");
 
   if (n > 0)
     sprintf (buf + strlen (buf), " -N %d", n);
@@ -72,13 +72,13 @@ sfdisk (const char *device, int n, int cyls, int heads, int sectors,
 
   fp = popen (buf, "w");
   if (fp == NULL) {
-    reply_with_perror (buf);
+    reply_with_perror ("failed to open pipe: %s", buf);
     return -1;
   }
 
   for (i = 0; lines[i] != NULL; ++i) {
     if (fprintf (fp, "%s\n", lines[i]) < 0) {
-      reply_with_perror (buf);
+      reply_with_perror ("failed to write to pipe: %s", buf);
       pclose (fp);
       return -1;
     }
@@ -122,9 +122,9 @@ sfdisk_flag (const char *device, const char *flag)
   char *out, *err;
   int r;
 
-  r = command (&out, &err, "/sbin/sfdisk", flag, device, NULL);
+  r = command (&out, &err, "sfdisk", flag, device, NULL);
   if (r == -1) {
-    reply_with_error ("sfdisk: %s: %s", device, err);
+    reply_with_error ("%s: %s", device, err);
     free (out);
     free (err);
     return NULL;