[Pkg-libvirt-commits] [libguestfs] 05/40: v2v: Allow -o local as an alias for -o disk.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag debian/1%1.27.44-1
in repository libguestfs.

commit c22d86870c9099935c8b92471ba4eb711c0b7018
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Sep 9 23:08:24 2014 +0100

    v2v: Allow -o local as an alias for -o disk.
    
    This is symmetrical with -i disk / -i local.
---
 v2v/cmdline.ml   | 2 +-
 v2v/virt-v2v.pod | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
index affe36f..c1f30d7 100644
--- a/v2v/cmdline.ml
+++ b/v2v/cmdline.ml
@@ -76,7 +76,7 @@ let parse_cmdline () =
   let set_output_mode = function
     | "glance" -> output_mode := `Glance
     | "libvirt" -> output_mode := `Libvirt
-    | "local" -> output_mode := `Local
+    | "disk" | "local" -> output_mode := `Local
     | "ovirt" | "rhev" -> output_mode := `RHEV
     | s ->
       error (f_"unknown -o option: %s") s
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
index 7a72432..08040d0 100644
--- a/v2v/virt-v2v.pod
+++ b/v2v/virt-v2v.pod
@@ -241,6 +241,10 @@ a faulty guest (one with no disks).
 
 This option is not compatible with I<-o glance> for technical reasons.
 
+=item B<-o disk>
+
+This is the same as I<-o local>.
+
 =item B<-o glance>
 
 Set the output method to OpenStack Glance.  In this mode the converted

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git