diff options
| author | Richard Jones <rjones@redhat.com> | 2010-09-08 09:37:22 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-09-08 09:59:32 +0100 |
| commit | fa918b166acd6123623fd0d03b5f4840b1579a02 (patch) | |
| tree | 4c74aeb5ffa49c6875dd28e34962a677b084f5d6 | |
| parent | 60cdd02b02578b427ca3926d566811c6bb7a9970 (diff) | |
| download | libguestfs-fa918b166acd6123623fd0d03b5f4840b1579a02.tar.gz libguestfs-fa918b166acd6123623fd0d03b5f4840b1579a02.tar.xz libguestfs-fa918b166acd6123623fd0d03b5f4840b1579a02.zip | |
fish: Allow guestfish -N help for listing prepared disk image help.
| -rw-r--r-- | fish/fish.c | 5 | ||||
| -rw-r--r-- | fish/guestfish.pod | 6 | ||||
| -rw-r--r-- | fish/prep.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/fish/fish.c b/fish/fish.c index 96965453..64339422 100644 --- a/fish/fish.c +++ b/fish/fish.c @@ -318,7 +318,10 @@ main (int argc, char *argv[]) break; case 'N': - if (STRCASEEQ (optarg, "list")) { + if (STRCASEEQ (optarg, "list") || + STRCASEEQ (optarg, "help") || + STRCASEEQ (optarg, "h") || + STRCASEEQ (optarg, "?")) { list_prepared_drives (); exit (EXIT_SUCCESS); } diff --git a/fish/guestfish.pod b/fish/guestfish.pod index 3b9aa203..e715e6e9 100644 --- a/fish/guestfish.pod +++ b/fish/guestfish.pod @@ -103,7 +103,7 @@ a single ext2-formatted partition: To list what is available do: - guestfish -N list | less + guestfish -N help | less =head2 Remote control @@ -225,7 +225,7 @@ or you can use the L<virt-list-filesystems(1)> program. Disable autosync. This is enabled by default. See the discussion of autosync in the L<guestfs(3)> manpage. -=item B<-N type> | B<--new type> | B<-N list> +=item B<-N type> | B<--new type> | B<-N help> Prepare a fresh disk image formatted as "type". This is an alternative to the I<-a> option: whereas I<-a> adds an existing disk, @@ -717,7 +717,7 @@ for an ext4 filesystem on a 1GB disk instead. To list the available types and any extra parameters they take, run: - guestfish -N list | less + guestfish -N help | less Note that the prepared filesystem is not mounted. You would usually have to use the C<mount /dev/sda1 /> command or add the diff --git a/fish/prep.c b/fish/prep.c index 369dd6d4..59fa8a7a 100644 --- a/fish/prep.c +++ b/fish/prep.c @@ -95,7 +95,7 @@ parse_type_string (const char *type_string) if (i == NR_PREPS) { fprintf (stderr, _("\ guestfish: -N parameter '%s': no such prepared disk image known.\n\ -Use 'guestfish -N list' to list possible values for the -N parameter.\n"), +Use 'guestfish -N help' to list possible values for the -N parameter.\n"), type_string); exit (EXIT_FAILURE); } |