Rename virt-unpack to virt-convert. Signed-off-by: John Levon <john.levon@xxxxxxx> diff --git a/man/en/Makefile b/man/en/Makefile --- a/man/en/Makefile +++ b/man/en/Makefile @@ -1,9 +1,9 @@ CENTER="Virtual Machine Install Tools" CENTER="Virtual Machine Install Tools" -all: virt-install.1 virt-image.1 virt-clone.1 virt-image.5 +all: virt-install.1 virt-image.1 virt-clone.1 virt-image.5 virt-convert.1 -html: virt-install.html virt-clone.html virt-image.html virt-image-xml.html +html: virt-install.html virt-clone.html virt-image.html virt-image-xml.html virt-convert.html clean: rm *.1 *.5 diff --git a/man/en/virt-unpack.1 b/man/en/virt-convert.1 rename from man/en/virt-unpack.1 rename to man/en/virt-convert.1 --- a/man/en/virt-convert.1 +++ b/man/en/virt-convert.1 @@ -128,16 +128,16 @@ .rm #[ #] #H #V #F C .\" ======================================================================== .\" -.IX Title "VIRT-UNPACK 1" -.TH VIRT-UNPACK 1 "2008-07-01" "perl v5.8.8" "Virtual Machine Install Tools" +.IX Title "VIRT-CONVERT 1" +.TH VIRT-CONVERT 1 "2008-07-01" "perl v5.8.8" "Virtual Machine Install Tools" .SH "NAME" -virt\-unpack \- convert virtual machines between formats +virt\-convert \- convert virtual machines between formats .SH "SYNOPSIS" .IX Header "SYNOPSIS" -\&\fBvirt-unpack\fR [\s-1OPTION\s0]... \s-1INPUT\s0.VMX|INPUT\-DIR [\s-1OUTPUT\s0.XML|OUTPUT\-DIR] +\&\fBvirt-convert\fR [\s-1OPTION\s0]... \s-1INPUT\s0.VMX|INPUT\-DIR [\s-1OUTPUT\s0.XML|OUTPUT\-DIR] .SH "DESCRIPTION" .IX Header "DESCRIPTION" -\&\fBvirt-unpack\fR is a command line tool for converting virtual machines +\&\fBvirt-convert\fR is a command line tool for converting virtual machines from one format to another. Pass in either a \s-1VM\s0 definition file (such as VMWare vmx format) or a directory containing a \s-1VM\s0. By default, a new \&\s-1VM\s0 definition file, and converted disk images, will be placed in a new @@ -151,7 +151,7 @@ alongside any disks in the same director alongside any disks in the same directory. .SH "OPTIONS" .IX Header "OPTIONS" -Any of the options can be omitted, in which case \fBvirt-unpack\fR will use defaults when required. +Any of the options can be omitted, in which case \fBvirt-convert\fR will use defaults when required. An input \s-1VM\s0 definition or containing directory must be provided. By default, an output directory is generated based upon the name of the \s-1VM\s0. The default input format is VMWare vmx, and the default output format is @@ -182,13 +182,13 @@ Convert a paravirt guest from \f(CW\*(C` Convert a paravirt guest from \f(CW\*(C`image.vmx\*(C'\fR: .PP .Vb 1 -\& # virt-unpack --arch=i686 --paravirt image.vmx +\& # virt-convert --arch=i686 --paravirt image.vmx .Ve .PP Convert a 64\-bit hvm guest: .PP .Vb 1 -\& # virt-unpack --arch=x86_64 vmx-appliance/ hvm-appliance/ +\& # virt-convert --arch=x86_64 vmx-appliance/ hvm-appliance/ .Ve .SH "AUTHOR" .IX Header "AUTHOR" diff --git a/man/en/virt-unpack.pod b/man/en/virt-convert.pod rename from man/en/virt-unpack.pod rename to man/en/virt-convert.pod --- a/man/en/virt-convert.pod +++ b/man/en/virt-convert.pod @@ -2,15 +2,15 @@ =head1 NAME -virt-unpack - convert virtual machines between formats +virt-convert - convert virtual machines between formats =head1 SYNOPSIS -B<virt-unpack> [OPTION]... INPUT.VMX|INPUT-DIR [OUTPUT.XML|OUTPUT-DIR] +B<virt-convert> [OPTION]... INPUT.VMX|INPUT-DIR [OUTPUT.XML|OUTPUT-DIR] =head1 DESCRIPTION -B<virt-unpack> is a command line tool for converting virtual machines +B<virt-convert> is a command line tool for converting virtual machines from one format to another. Pass in either a VM definition file (such as VMWare vmx format) or a directory containing a VM. By default, a new VM definition file, and converted disk images, will be placed in a new @@ -25,7 +25,7 @@ alongside any disks in the same director =head1 OPTIONS -Any of the options can be omitted, in which case B<virt-unpack> will use defaults when required. +Any of the options can be omitted, in which case B<virt-convert> will use defaults when required. An input VM definition or containing directory must be provided. By default, an output directory is generated based upon the name of the VM. The default input format is VMWare vmx, and the default output format is @@ -67,11 +67,11 @@ Print debugging information Convert a paravirt guest from C<image.vmx>: - # virt-unpack --arch=i686 --paravirt image.vmx + # virt-convert --arch=i686 --paravirt image.vmx Convert a 64-bit hvm guest: - # virt-unpack --arch=x86_64 vmx-appliance/ hvm-appliance/ + # virt-convert --arch=x86_64 vmx-appliance/ hvm-appliance/ =head1 AUTHOR diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ datafiles = [('share/man/man1', ['man/en 'man/en/virt-clone.1', 'man/en/virt-image.1', 'man/en/virt-pack.1', - 'man/en/virt-unpack.1']), + 'man/en/virt-convert.1']), ('share/man/man5', ['man/en/virt-image.5'])] locale = None builddir = None @@ -118,7 +118,7 @@ setup(name='virtinst', license='GPL', package_dir={'virtinst': 'virtinst'}, scripts = ["virt-install","virt-clone", "virt-image", "virt-pack", - "virt-unpack"], + "virt-convert"], packages=pkgs, data_files = datafiles, cmdclass = { 'test': TestCommand, 'build': build, \ diff --git a/virt-unpack b/virt-convert rename from virt-unpack rename to virt-convert --- a/virt-convert +++ b/virt-convert @@ -248,7 +248,7 @@ def convert_disks(disks_list, options): def main(): options = parse_args() - cli.setupLogging("virt-unpack", options.debug) + cli.setupLogging("virt-convert", options.debug) logging.debug("input_file: %s" % options.input_file) logging.debug("input_dir: %s" % options.input_dir) _______________________________________________ et-mgmt-tools mailing list et-mgmt-tools@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/et-mgmt-tools