X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=fish%2Ffish.c;h=c4fdf79927f87b5e9a569ab72d6e9d6c9a08f8ab;hb=afa17809599f3ebc82c3feef025ca812fb26c9fe;hp=22f3359ef0e1ba6c60358f9870c3ab04a0466363;hpb=0daf7e81a659bcdc1ce327151cc1207b124a35a1;p=libguestfs.git diff --git a/fish/fish.c b/fish/fish.c index 22f3359..c4fdf79 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -117,7 +117,7 @@ usage (int status) " --keys-from-stdin Read passphrases from stdin\n" " --listen Listen for remote commands\n" " --live Connect to a live virtual machine\n" - " -m|--mount dev[:mnt] Mount dev on mnt (if omitted, /)\n" + " -m|--mount dev[:mnt[:opts]] Mount dev on mnt (if omitted, /)\n" " -n|--no-sync Don't autosync\n" " -N|--new type Create prepared disk (test1.img, ...)\n" " --progress-bars Enable progress bars even when not interactive\n" @@ -158,6 +158,8 @@ main (int argc, char *argv[]) bindtextdomain (PACKAGE, LOCALEBASEDIR); textdomain (PACKAGE); + parse_config (); + set_up_terminal (); enum { HELP_OPTION = CHAR_MAX + 1 };