X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fgenerator.ml;h=e9738999f6807cc55358f6fa9b16fc36c1b3e734;hb=08ddf6b1d9b6c19c87b82a44d5e0fffd70e41635;hp=e9965212bdabdb10b1368617728393f661dfba46;hpb=9e0b31a2af26b8d58a44dd80993a5e73d4942307;p=libguestfs.git

diff --git a/src/generator.ml b/src/generator.ml
index e996521..e973899 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -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);
 
@@ -7394,6 +7394,8 @@ and generate_fish_cmds () =
   ) all_functions;
   pr "    {\n";
   pr "      fprintf (stderr, _(\"%%s: unknown command\\n\"), cmd);\n";
+  pr "      if (command_num == 1)\n";
+  pr "        extended_help_message ();\n";
   pr "      return -1;\n";
   pr "    }\n";
   pr "  return 0;\n";