git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
suppress a warning from -Wswitch-default
[libguestfs.git]
/
v2v
/
virt-v2v.pl
diff --git
a/v2v/virt-v2v.pl
b/v2v/virt-v2v.pl
index
d3fa647
..
11d7cfd
100755
(executable)
--- a/
v2v/virt-v2v.pl
+++ b/
v2v/virt-v2v.pl
@@
-28,6
+28,7
@@
use Getopt::Long;
use Data::Dumper;
use File::Temp qw/tempdir/;
use XML::Writer;
use Data::Dumper;
use File::Temp qw/tempdir/;
use XML::Writer;
+use Locale::TextDomain 'libguestfs';
=encoding utf8
=encoding utf8
@@
-159,9
+160,9
@@
Set the output guest name.
=cut
GetOptions ("help|?" => \$help,
=cut
GetOptions ("help|?" => \$help,
- "version" => \$version,
- "connect|c=s" => \$uri,
- "output|o=s" => \$output,
+
"version" => \$version,
+
"connect|c=s" => \$uri,
+
"output|o=s" => \$output,
) or pod2usage (2);
pod2usage (1) if $help;
if ($version) {
) or pod2usage (2);
pod2usage (1) if $help;
if ($version) {
@@
-170,7
+171,7
@@
if ($version) {
print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
exit
}
print "$h{major}.$h{minor}.$h{release}$h{extra}\n";
exit
}
-pod2usage (
"$0
: no image or VM names given") if @ARGV == 0;
+pod2usage (
__"virt-v2v
: no image or VM names given") if @ARGV == 0;
# XXX This should be an option. Disable for now until we get
# downloads working reliably.
# XXX This should be an option. Disable for now until we get
# downloads working reliably.
@@
-191,7
+192,7
@@
my @partitions = get_partitions ($g);
# Now query each one to build up a picture of what's in it.
my %fses =
inspect_all_partitions ($g, \@partitions,
# Now query each one to build up a picture of what's in it.
my %fses =
inspect_all_partitions ($g, \@partitions,
- use_windows_registry => $use_windows_registry);
+
use_windows_registry => $use_windows_registry);
#print "fses -----------\n";
#print Dumper(\%fses);
#print "fses -----------\n";
#print Dumper(\%fses);
@@
-204,8
+205,8
@@
my $oses = inspect_operating_systems ($g, \%fses);
# Only work on single-root operating systems.
my $root_dev;
my @roots = keys %$oses;
# Only work on single-root operating systems.
my $root_dev;
my @roots = keys %$oses;
-die "no root device found in this operating system image" if @roots == 0;
-die "multiboot operating systems are not supported by v2v" if @roots > 1;
+die
__
"no root device found in this operating system image" if @roots == 0;
+die
__
"multiboot operating systems are not supported by v2v" if @roots > 1;
$root_dev = $roots[0];
# Mount up the disks and check for applications.
$root_dev = $roots[0];
# Mount up the disks and check for applications.