search for: get_transfer_path

...-------- 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 iso is mounted + if (!exist...

...= "/windows/system32/drivers"; - $driverpath = $g->case_sensitive_path ($driverpath); + # Check we have all required files + my @missing; + my %files; - my ($app, $depnames) = $config->match_app ($desc, "viostor", $desc->{arch}); - $app = $config->get_transfer_path ($g, $app); - $g->cp ($app, $driverpath); -} + for my $file ("viostor", "firstboot", "firstbootapp", "rhsrvany") { + my ($path) = $config->match_app ($desc, $file, $desc->{arch}); + my $local = $config->get_transfer_path ($g, $...

...ys/VirtConvert/Converter/Windows.pm @@ -312,13 +312,24 @@ sub _prepare_virtio_drivers return ($block, $net); } - # We can't proceed if there are any files missing + # We can't install any drivers if the defined virtio path is missing my $virtio_guest = $config->get_transfer_path($virtio_host); - v2vdie __x('Installation failed because the following '. - 'files referenced in the configuration file are '. - 'required, but missing: {list}', - list => $virtio_host) - unless (defined($virtio_host) &a...

...irtIO drivers to the guest + my $driverdir = File::Spec->catdir($g->case_sensitive_path("/windows"), "Drivers/VirtIO"); + + $g->mkdir_p($driverdir); + + my ($virtio) = $config->match_app ($desc, 'virtio', $desc->{arch}); + $virtio = $config->get_transfer_path($g, $virtio); + + foreach my $src ($g->ls($virtio)) { + my $name = $src; + $src = File::Spec->catfile($virtio); + my $dst = File::Spec->catfile($driverdir, $name); + $g->cp_a($src, $dst); + } + + # Locate and download the SOFTWARE hive + my $sw_lo...

This patch allows paths in virt-v2v.conf to be either relative or absolute. If relative, they are relative to software-root. This allows virt-v2v.conf to use files provided by packages independent of virt-v2v. --- lib/Sys/VirtV2V/Config.pm | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Sys/VirtV2V/Config.pm b/lib/Sys/VirtV2V/Config.pm index f703152..121e774

...} + } + } + } else { + $user = []; + } + + foreach my $pkg (@$install, @$upgrade) { + push(@$user, $pkg->[0]); + } + + my @missing; + if (defined($kernel)) { + foreach my $pkg (@$kernel) { + my $transfer_path = $config->get_transfer_path($pkg); + if (!defined($transfer_path) || !$g->exists($transfer_path)) { + push(@missing, $pkg); + } + } + } + + my @user_paths = _get_deppaths($g, $root, $config, + \@missing, $g->inspect_get_arch($root), @$us...

...} + } + } + } else { + $user = []; + } + + foreach my $pkg (@$install, @$update) { + push(@$user, $pkg->[0]); + } + + my @missing; + if (defined($kernel)) { + foreach my $pkg (@$kernel) { + my $transfer_path = $config->get_transfer_path($pkg); + if (!defined($transfer_path) || !$g->exists($transfer_path)) { + push(@missing, $pkg); + } + } + } + + my @user_paths = _get_deppaths($g, $root, $config, + \@missing, $g->inspect_get_arch($root), @$us...

This is a new conversion module to convert SUSE Linux and openSUSE guests. The converter is based on the RedHat module, and should offer the same functionality on both SUSE and RedHat hosts. There are a few additional messages in this module, such as reporting of packages when installing through zypper or the local virt-v2v repo. These messages don't necessarily flow unless verbose switches

...rtV2V/GuestfsHandle.pm lib/Sys/VirtV2V/GuestOS.pm lib/Sys/VirtV2V/GuestOS/RedHat.pm lib/Sys/VirtV2V/Config.pm diff --git a/lib/Sys/VirtV2V/Config.pm b/lib/Sys/VirtV2V/Config.pm index 3f689e0..761bee5 100644 --- a/lib/Sys/VirtV2V/Config.pm +++ b/lib/Sys/VirtV2V/Config.pm @@ -233,10 +233,13 @@ sub get_transfer_path my $transfer = $devices[$#devices]; $g->mount_ro($transfer, $self->{transfer_mount}); - $self->{transfer_mounted} = 1; - # We'll need this to unmount in DESTROY - $self->{g} = $g; + # Umount and remove the tra...

...pms > +{ > + local $_; > + my ($g, $config, $update, @rpms) = @_; > + > + # Nothing to do if we got an empty set > + return if(scalar(@rpms) == 0); > + > + # All paths are relative to the transfer mount. Need to make them absolute. > + # No need to check get_transfer_path here as all paths have been previously > + # checked > + @rpms = map { $_ = $config->get_transfer_path($_) } @rpms; > + > + logmsg NOTICE, __x('Falling back to local virt-v2v repo:'); > + foreach my $pkg (@rpms) { > + (my $pkgname = $pkg) =~ s/(.*\/)/...