X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgenerator.ml;h=f519c4d6864ff2cbef42a713608edb6def7145c8;hb=f25da97554885d5032f124e12c1995d6eab720dd;hp=b04bbe03cb4523addd89a5eccc6e77f49e3b097a;hpb=57c143da4d9b9e75e6da83ef3b8e8c0979c6f0f6;p=libguestfs.git

diff --git a/src/generator.ml b/src/generator.ml
index b04bbe0..f519c4d 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -6145,7 +6145,7 @@ and generate_daemon_actions () =
         pr "  ret->guestfs_int_lvm_%s_list_val = NULL;\n" typ;
         pr "\n";
         pr "  r = command (&out, &err,\n";
-        pr "	       \"/sbin/lvm\", \"%ss\",\n" typ;
+        pr "	       \"lvm\", \"%ss\",\n" typ;
         pr "	       \"-o\", lvm_%s_cols, \"--unbuffered\", \"--noheadings\",\n" typ;
         pr "	       \"--nosuffix\", \"--separator\", \",\", \"--units\", \"b\", NULL);\n";
         pr "  if (r == -1) {\n";
@@ -6450,14 +6450,14 @@ int main (int argc, char *argv[])
     exit (EXIT_FAILURE);
   }
 
+  /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
+  alarm (600);
+
   if (guestfs_launch (g) == -1) {
     printf (\"guestfs_launch FAILED\\n\");
     exit (EXIT_FAILURE);
   }
 
-  /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
-  alarm (600);
-
   /* Cancel previous alarm. */
   alarm (0);