search for: _augeas_error

...files changed, 121 insertions(+), 64 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index cf8787d..8b211f0 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -93,6 +93,59 @@ sub new return $self; } +sub _augeas_error +{ + my $self = shift; + my ($err) = @_; # The original error message. We will emit this if there + # were no augeas errors. + + my $g = $self->{g}; + + my $msg = ""; + + foreach my $error ($g->aug_match('/augeas/files//error')) { + $...

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

...-*'); + + eval { + # Upgrade dependencies if needed + if (@preinst_cmd) { + $self->{g}->command(\@preinst_cmd); + } + # Install new kernel + $self->{g}->command(\@inst_cmd); + }; + + $self->_augeas_error($@) if ($@); + + # Figure out which kernel has just been installed + foreach my $k ($self->{g}->glob_expand('/boot/vmlinuz-*')) { + grep(/^$k$/, @k_before) or push(@k_new, $k); + } + + # version-release of the new kernel package + $version...

Add a directory to contain required augeas lenses which aren't yet upstream. Include a new lens for grub's device.map. --- augeas/README.txt | 4 ++++ augeas/device_map.aug | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 augeas/README.txt create mode 100644 augeas/device_map.aug diff --git a/augeas/README.txt

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

The following patches add RHEL 6 guest support to virt-v2v. This was actually quite a lot easier than I expected. * [PATCH 1/4] Update virt-v2v.conf for RHEL 6 virtio support * [PATCH 2/4] Check kudzu exists before attempting to disable it * [PATCH 3/4] Use dracut rather than mkinitrd if it's available * [PATCH 4/4] Properly convert RHEL 6 guest console

...lf->{config}->get_transfer_path($g, $_) } @rpms; - my $g = $self->{g}; $g->command(['rpm', $upgrade == 1 ? '-U' : '-i', @rpms]); # Reload augeas in case the rpm installation changed anything @@ -1496,46 +1503,6 @@ sub _install_rpms $self->_augeas_error($@) if($@); } -# Get full, local path of a file on the transfer mount -sub _transfer_path -{ - my $self = shift; - - my ($path) = @_; - - $self->_ensure_transfer_mounted(); - - return File::Spec->catfile($self->{transfer_mount}, $path); -} - -# Ensure that the transfer devic...