search for: iso_path

...------------------- 1 files changed, 1 insertions(+), 44 deletions(-) diff --git a/lib/Sys/VirtV2V/Config.pm b/lib/Sys/VirtV2V/Config.pm index ffb9424..8062280 100644 --- a/lib/Sys/VirtV2V/Config.pm +++ b/lib/Sys/VirtV2V/Config.pm @@ -150,50 +150,7 @@ sub get_transfer_iso unless defined($iso_path); $iso_path = $iso_path->getData(); - # Check if the transfer iso exists, and is newer than the config file - if (-e $iso_path) { - my $iso_st = stat($iso_path) - or die __x("Unable to stat {path}: {error}", - path => $iso_path, e...

..."the config file", + path => $path))) unless (-r $abs); + + $path_args{"$path=$abs"} = 1; + } + + # Nothing further to do if there are no paths + return if (keys(%path_args) == 0); + + # Get the path of the transfer iso + my ($iso_path) = $dom->findnodes('/virt-v2v/iso-path/text()'); + + # We need this + die(user_message(__"<iso-path> must be specified in the configuration ". + "file")) unless (defined($iso_path)); + $iso_path = $iso_path->getData(); + + #...

...f (-r $abs) { + $path_args{"$path=$abs"} = 1; + $paths{$abs} = 1; + } } # Nothing further to do if there are no paths @@ -140,16 +139,27 @@ sub get_transfer_iso # Check if the transfer iso exists, and is newer than the config file if (-e $iso_path) { my $iso_st = stat($iso_path) - or die(user_message(__x("Unable to stat iso file {path}: {error}", + or die(user_message(__x("Unable to stat {path}: {error}", path => $iso_path, error => $!)));...

Previously, only the LibVirtXML connection translated network and bridge names in imported metadata. This change moves this functionality in Converter, making it available to LibVirt connections as well. At the same time, the format of the config file is switched to XML. The primary driver for this is that the allowable syntax of a foreign network/bridge name is not known. Rather than create a

Previously, only the LibVirtXML connection translated network and bridge names in imported metadata. This change moves this functionality in Converter, making it available to LibVirt connections as well. At the same time, the format of the config file is switched to XML. The primary driver for this is that the allowable syntax of a foreign network/bridge name is not known. Rather than create a

...my $dir_st = stat($dir); + if ($dir_st->mtime > $iso_st->mtime) { + $rebuild = 1; + last; + } + $dirs{$dir} = 1; + } } return $iso_path if (!$rebuild); -- 1.6.6.1

...+++--------------------------- 3 files changed, 72 insertions(+), 91 deletions(-) diff --git a/lib/Sys/VirtV2V/Config.pm b/lib/Sys/VirtV2V/Config.pm index 334adf9..10ef8be 100644 --- a/lib/Sys/VirtV2V/Config.pm +++ b/lib/Sys/VirtV2V/Config.pm @@ -203,6 +203,44 @@ sub get_transfer_iso return $iso_path; } +=item get_transfer_path(path) + +Return the path to I<path> as accessible by the libguestfs appliance. This +function will also ensure that the transfer iso is mounted. + +=cut + +sub get_transfer_path +{ + my $self = shift; + my ($g, $path) = @_; + + # Check that the transfer...

...m = $self->{dom}; + return undef unless (defined($dom)); + # path-root doesn't have to be defined my ($root) = $dom->findnodes('/virt-v2v/path-root/text()'); $root = $root->getData() if (defined($root)); @@ -175,15 +180,7 @@ sub get_transfer_iso return $iso_path; } -=item get_app_search(desc, name, arch) - -Return a string describing what v2v is looking for in the config file. The -string is intended to be presented to the user to help improve the configuration -file. - -=cut - -sub get_app_search +sub _get_app_search { my ($desc, $name, $arch) =...

This patch series includes a repost of Milan's unmodified RHN support patch because I haven't pushed it yet. On top of that patch, it includes the capabilities patch in as many bits as I could make it into. The big one is 7/8. I've tested all of the following guests both with and without RHN registration: Xen RHEL 54 PV Xen RHEL 51 PV Xen RHEL 48 PV ESX RHEL 54 FV