search for: exechelper

Building on EL-5 fails when the result of File::Temp->new() is passed to open3(). tmpfile() works consistently. --- lib/Sys/VirtV2V/ExecHelper.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/ExecHelper.pm b/lib/Sys/VirtV2V/ExecHelper.pm index 110ae9f..f577ff6 100644 --- a/lib/Sys/VirtV2V/ExecHelper.pm +++ b/lib/Sys/VirtV2V/ExecHelper.pm @@ -20,7 +20,7 @@ package Sys::VirtV2V::ExecHelper; use...

--- lib/Sys/VirtV2V/ExecHelper.pm | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/Sys/VirtV2V/ExecHelper.pm b/lib/Sys/VirtV2V/ExecHelper.pm index 87f6d06..110ae9f 100644 --- a/lib/Sys/VirtV2V/ExecHelper.pm +++ b/lib/Sys/VirtV2V/ExecHelper.pm @@ -68,25 +68,17 @@ sub run my $self...

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

...v2v/virt-v2v.pl | 96 +---------- 6 files changed, 385 insertions(+), 247 deletions(-) create mode 100644 lib/Sys/VirtV2V/Config.pm diff --git a/MANIFEST b/MANIFEST index a83d682..65b5a8e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -6,6 +6,7 @@ lib/Sys/VirtV2V.pm lib/Sys/VirtV2V/ExecHelper.pm lib/Sys/VirtV2V/GuestOS.pm lib/Sys/VirtV2V/GuestOS/RedHat.pm +lib/Sys/VirtV2V/Config.pm lib/Sys/VirtV2V/Converter.pm lib/Sys/VirtV2V/Converter/Linux.pm lib/Sys/VirtV2V/Connection.pm diff --git a/lib/Sys/VirtV2V/Config.pm b/lib/Sys/VirtV2V/Config.pm new file mode 100644 index 0000000..b9e4d3...

Cleanup was not happening properly if a migration to RHEV was killed prematurely with a Ctrl-C. Firstly, the SIGINT and SIGQUIT handlers were not being registered early enough in virt-v2v.pl. Secondly, if Ctrl-C killed the guestfs qemu process first it would deliver a SIGPIPE to v2v, which caused an unclean shutdown without cleanup. Fixes RHBZ#596015 --- v2v/virt-v2v.pl | 17 ++++++++++++++---

...$dirs{$dir} = 1; - } - } - - if (!$rebuild) { - $self->{iso} = $iso_path; - return $iso_path; - } - } - } - - # Re-create the transfer iso + # Create the transfer iso my $eh = Sys::VirtV2V::ExecHelper->run ('mkisofs', '-o', $iso_path, '-r', '-J', -- 1.7.3.4

...| 72 ++------------ 4 files changed, 223 insertions(+), 80 deletions(-) create mode 100644 lib/Sys/VirtV2V/GuestfsHandle.pm diff --git a/MANIFEST b/MANIFEST index 06df2aa..fb6a2fc 100644 --- a/MANIFEST +++ b/MANIFEST @@ -4,6 +4,7 @@ COPYING COPYING.LIB lib/Sys/VirtV2V.pm lib/Sys/VirtV2V/ExecHelper.pm +lib/Sys/VirtV2V/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...

...pid})) { kill(9, $self->{pid}); waitpid($self->{pid}, WNOHANG); + $retval ||= $?; } + + $? = $retval; } package Sys::VirtV2V::Target::RHEV::Vol; @@ -441,6 +446,8 @@ sub DESTROY { my $self = shift; + my $retval = $?; + my $eh = Sys::VirtV2V::ExecHelper->run('umount', $self->{mountdir}); if ($eh->status() != 0) { print STDERR user_message(__x("Failed to unmount {path}. Command ". @@ -449,6 +456,7 @@ sub DESTROY path => $self->{domain_path},...

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

....pl b/v2v/virt-v2v.pl index 33e65f3..a9e834f 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -36,6 +36,7 @@ use Sys::VirtV2V; use Sys::VirtV2V::Converter; use Sys::VirtV2V::Connection::LibVirt; use Sys::VirtV2V::Connection::LibVirtXML; +use Sys::VirtV2V::Target::LibVirt; use Sys::VirtV2V::ExecHelper; use Sys::VirtV2V::GuestOS; use Sys::VirtV2V::UserMessage qw(user_message); @@ -99,11 +100,29 @@ my $input_transport; =item B<-it method> -Species the transport method used to obtain raw storage from the source guest. +Specifies the transport method used to obtain raw storage from the...

...| 62 +++++++++++++++++++++++ 6 files changed, 169 insertions(+), 113 deletions(-) delete mode 100644 v2v/virt-v2v.conf create mode 100644 v2v/virt-v2v.xml diff --git a/MANIFEST b/MANIFEST index 3d6bf00..2513714 100644 --- a/MANIFEST +++ b/MANIFEST @@ -35,6 +35,6 @@ t/003-syntax.t t/004-ExecHelper.t TODO v2v/run-v2v-locally -v2v/virt-v2v.conf +v2v/virt-v2v.xml v2v/virt-v2v.conf.pod v2v/virt-v2v.pl diff --git a/lib/Sys/VirtV2V/Connection/LibVirtXML.pm b/lib/Sys/VirtV2V/Connection/LibVirtXML.pm index 6867a9b..5d0ebbc 100644 --- a/lib/Sys/VirtV2V/Connection/LibVirtXML.pm +++ b/lib/Sys/VirtV...

...to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -use warnings; -use strict; - -use English; - -use File::Temp qw(tempfile); -use Getopt::Long; -use Pod::Usage; - -use Locale::TextDomain 'virt-v2v'; - -use Sys::Virt; - -use Sys::VirtV2V; -use Sys::VirtV2V::ExecHelper; -use Sys::VirtV2V::Connection; -use Sys::VirtV2V::UserMessage qw(user_message); - -=encoding utf8 - -=head1 NAME - -v2v-snapshot - Convert a guest to use a qcow2 snapshot for storage - -=head1 SYNOPSIS - - v2v-snapshot guest-domain - - v2v-snapshot --rollback guest-domain - - v2v-snapshot --commit...

In preparation for an upcoming patch which adds support for SUSE guest conversions, it makes sense to have an intermediate steps that changes the RedHat.pm converter into a more generic Linux converter. The SUSE changes will then be limited in scope to only what is required for SUSE support. This series of patches accomplishes the following: - Renames RedHat.pm to Linux.pm - Modifies Linux.pm

...>{imagedir}))); } $class->_cleanup(); @@ -405,9 +498,10 @@ sub _cleanup $tmpdir = undef; } -package Sys::VirtV2V::Target::RHEV; +package Sys::VirtV2V::Connection::RHEVTarget; use File::Temp qw(tempdir); +use File::Spec::Functions; use Time::gmtime; use Sys::VirtV2V::ExecHelper; @@ -417,26 +511,15 @@ use Locale::TextDomain 'virt-v2v'; =head1 NAME -Sys::VirtV2V::Target::RHEV - Output to a RHEV Export storage domain - -=head1 SYNOPSIS - - use Sys::VirtV2V::Target::RHEV; - - my $target = new Sys::VirtV2V::Target::RHEV($domain_path); - -=head1 DESCRIPTION - -Sys:...

...lib/Sys/VirtConvert/Connection/VMwareOVASource.pm > lib/Sys/VirtConvert/Connection/Volume.pm > lib/Sys/VirtConvert/Converter.pm > lib/Sys/VirtConvert/Converter/RedHat.pm > +lib/Sys/VirtConvert/Converter/SUSE.pm > lib/Sys/VirtConvert/Converter/Windows.pm > lib/Sys/VirtConvert/ExecHelper.pm > lib/Sys/VirtConvert/GuestfsHandle.pm > diff --git a/lib/Sys/VirtConvert/Converter/SUSE.pm b/lib/Sys/VirtConvert/Converter/SUSE.pm > new file mode 100644 > index 0000000..7227385 > --- /dev/null > +++ b/lib/Sys/VirtConvert/Converter/SUSE.pm > @@ -0,0 +1,2527 @@ > +# Sys...

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

...+ b/MANIFEST @@ -17,6 +17,7 @@ lib/Sys/VirtConvert/Connection/VMwareOVASource.pm lib/Sys/VirtConvert/Connection/Volume.pm lib/Sys/VirtConvert/Converter.pm lib/Sys/VirtConvert/Converter/RedHat.pm +lib/Sys/VirtConvert/Converter/SUSE.pm lib/Sys/VirtConvert/Converter/Windows.pm lib/Sys/VirtConvert/ExecHelper.pm lib/Sys/VirtConvert/GuestfsHandle.pm diff --git a/lib/Sys/VirtConvert/Converter/SUSE.pm b/lib/Sys/VirtConvert/Converter/SUSE.pm new file mode 100644 index 0000000..7227385 --- /dev/null +++ b/lib/Sys/VirtConvert/Converter/SUSE.pm @@ -0,0 +1,2527 @@ +# Sys::VirtConvert::Converter::SUSE +# Copyri...

The following patches are where I'm currently at with ESX support. I can now import a domain from ESX along with its storage. Note that I'm not yet doing any conversion. In fact, I've never even tested past the import stage (I just had an exit in there). The meat is really in the 4th patch. The rename of MetadataReader->Connection was because the Connection is now really providing

These patches combine HVSource and HVTarget into a single Converter. This should make it more obvious where to hack without losing any practical flexibility. GuestOS remains separate. GuestOS is now a misnomer, because it's really only a Linux distro abstraction. It will be useless for Windows, for example. Functions which you'd expect to be different on a non-RH distro should live in

With this patchset I have successfully[1] imported a RHEL 5 guest directly from ESX with the following command line: virt-v2v -ic 'esx://yellow.marston/?no_verify=1' -op transfer RHEL5-64 Login details are stored in ~/.netrc Note that this is the only guest I've tested against. I haven't for example, checked that I haven't broken Xen imports. Matt [1] With the exception of