similar to: [PATCH] GuestOS: Fix error when checking for rpm which isn't installed

Conversion would fail if it was necessary to install a package, and multiple architectures of that package were already installed. This was happening specifically with device-mapper on RHEL 5 conversions. Unfortunately the flat dependency list in the config file didn't really allow this to be fixed. The best that could be done is to specify both i386 and x86_64 dependencies, but would mean

When a conversion requires a file from the config file which isn't present, we currently die and report which file was missing. If there are many missing dependencies, using this method to find them all would take multiple runs. This change attempts to find all missing dependencies in the first run. --- lib/Sys/VirtV2V/Config.pm | 9 ---- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 83

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index cd2f8e6..380dacb 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -862,6 +862,9 @@ sub remove_application $g->command(['rpm', '-e',

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 7c41ff6..ba37001 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1132,6 +1132,11 @@ sub remap_block_devices $g->aug_set($spec,

RHEL 3 has XF86Config instead of xorg.conf. The configs are sufficiently similar to be matched by the same augeas lens, so switch based on whichever is present. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 1920468..7c41ff6 100644 ---

The code for mounting the transfer iso in Converter::Windows didn't do the same level of error checking as the same code in GuestOS::RedHat. This change moves the GuestOS code into Config, and updates both GuestOS::RedHat and Converter::Windows to use Config. Fixes RHBZ#596091 --- lib/Sys/VirtV2V/Config.pm | 51 ++++++++++++++++++++++++ lib/Sys/VirtV2V/Converter/Windows.pm |

For guests registered with Red Hat Network, this patch allows for the conversion process to use RHN to download appropriate kernel package and its dependencies. We use yum on RHEL-5, up2date libraries on RHEL-4. We install matching kernel version whenever possible, latest available kernel version otherwise. _discover_kernel routine has been extended to return version-release of the default

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

Augeas now configures the Grub lens for /boot/grub/menu.lst by default. The code which was checking this was broken in the case where there was more than 1 included path. We now check if /boot/grub/menu.lst is included. If it is, we don't reload. If it isn't, we add it, but don't remove any other config first. This fixes RHBZ#586822 --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 25

mkinitrd needs to mount files using loop. loop might be a module, so try to load it first. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 0e469f5..08027b6 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1114,6

These checks found not to be useful. --- lib/Sys/VirtV2V/Converter/Linux.pm | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index 87eeeb3..1186430 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -133,14 +133,6 @@ sub convert sub

remap_block_devices was modifying the global device list while remapping device names for libata guests (which includes RHEL 6). This caused a failure later when the renamed devices were not present in the original XML. Fixes RHBZ#641869 --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm

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

RHEL 4's mkinitrd will fail to recognise that root is on LVM when running on a recent kernel/udev due to changes in naming. This patch detects LVM root for RHEL 4, and uses a dirty hack to frig mkinitrd if required. Fixes RHBZ#580461 --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git

We were previously forcing the augeas Modprobe lens to match modules.conf and conf.modules. It turns out that the contents of these files are quite different to modprobe.conf, requiring a new lens. This change keeps the logic which looks for where modules should go, but doesn't update the augeas configuration. If there is no augeas lens for /etc/modules.conf, any attempt to parse or modify it

We were assuming that guests wouldn't use multiple interfaces, or if they did, drive letters wouldn't clash between the interfaces. An ESX guest with a CDROM device breaks this because hard disks will be presented a SCSI, starting at sda, and CDROM devices are presented as IDE, starting at hda. This is in contrast to QEMU, which starts at hdc by default. Firstly, this change causes disks

This is belt and braces, because we've already added it to scsi_hostadapter. --- lib/Sys/VirtV2V/Converter/Linux.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index 375da48..d5a93a7 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -341,7 +341,7 @@

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

This is my lightly tested patch which allows pre-conversion of Windows guests. You also need to supply rhsrvany.exe and firstboot scripts. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc.

--- lib/Sys/VirtV2V/HVTarget/Linux.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/Sys/VirtV2V/HVTarget/Linux.pm b/lib/Sys/VirtV2V/HVTarget/Linux.pm index 53784ea..dc546de 100644 --- a/lib/Sys/VirtV2V/HVTarget/Linux.pm +++ b/lib/Sys/VirtV2V/HVTarget/Linux.pm @@ -349,7 +349,7 @@ sub _configure_kernel } # If we didn't install a new kernel, pick the