diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index ab47b28d1..0ef133834 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -142,7 +142,8 @@ let parse_cmdline () = let ditto = " -\"-" in let argspec = Arg.align [ - "--bridge", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; + "-b", Arg.String add_bridge, "in:out " ^ s_"Map bridge 'in' to 'out'"; + "--bridge", Arg.String add_bridge, ditto; "--debug-gc",Arg.Set debug_gc, " " ^ s_"Debug GC and memory allocations"; "--debug-overlay",Arg.Set debug_overlays, " " ^ s_"Save overlay files"; @@ -154,7 +155,8 @@ let parse_cmdline () = "format " ^ s_"Input format (for -i disk)"; "--long-options", Arg.Unit display_long_options, " " ^ s_"List long options"; "--machine-readable", Arg.Set machine_readable, " " ^ s_"Make output machine readable"; - "--network", Arg.String add_network, "in:out " ^ s_"Map network 'in' to 'out'"; + "-n", Arg.String add_network, "in:out " ^ s_"Map network 'in' to 'out'"; + "--network", Arg.String add_network, ditto; "--no-copy", Arg.Clear do_copy, " " ^ s_"Just write the metadata"; "--no-trim", Arg.String set_no_trim, "all|mp,mp,.." ^ s_"Don't trim selected mounts"; "-o", Arg.String set_output_mode, o_options ^ " " ^ s_"Set output mode (default: libvirt)"; diff --git a/v2v/test-v2v-networks-and-bridges.sh b/v2v/test-v2v-networks-and-bridges.sh index 178be9be0..68743d6c4 100755 --- a/v2v/test-v2v-networks-and-bridges.sh +++ b/v2v/test-v2v-networks-and-bridges.sh @@ -56,10 +56,10 @@ $VG virt-v2v --debug-gc \ -i libvirt -ic "$libvirt_uri" windows \ -o local -os $d --no-copy \ --bridge "VM Network:bridge1" \ - --bridge bridge2 \ + -b bridge2 \ --network default:network1 \ --network john:network2 \ - --network paul:network3 \ + -n paul:network3 \ --network network4 # Test the libvirt XML metadata was created. diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index 6383e8246..93df52044 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -152,6 +152,8 @@ qemu, do: Display help. +=item B<-b> ... + =item B<--bridge> ... See I<--network> below. @@ -231,10 +233,18 @@ This option is used to make the output more machine friendly when being parsed by other programs. See L below. +=item B<-n> in:out + +=item B<-n> out + =item B<--network> in:out =item B<--network> out +=item B<-b> in:out + +=item B<-b> out + =item B<--bridge> in:out =item B<--bridge> out