similar to: [PATCH] Check a grub kernel exists before selecting it

Add a function to display more complete augeas errors if they occur. Update all uses of augeas in GuestOS::RedHat to use it for error reporting. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 185 ++++++++++++++++++++++++------------- 1 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 ---

When installing kernel-2.6.18-128.el5 in a guest with kernel-xen-2.6.18-164.el5xen already installed, and 'root=LABEL=/' on the kernel command line, grubby fails to install a grub entry for the new kernel. It only fails when run under libguestfs. Installing in the original Xen guest works fine. The underlying cause appears to be related to blkid, although I haven't managed to pin it

Previously we used SCSI when VirtIO wasn't available. KVM's SCSI support is not as mature as its IDE support, and SCSI isn't supported at all in RHEV. --- lib/Sys/VirtV2V/Converter.pm | 50 +++++++++++------- lib/Sys/VirtV2V/Converter/Linux.pm | 19 ++++--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 100 ++++++++++++++++++++---------------- 3 files changed, 100 insertions(+), 69

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

--- 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

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

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

There were 2 issues in the code which checked for an existing grub entry before adding a new one. Firstly, it didn't take account of the fact that the passed-in kernel path is relative to root, whereas the grub entry is relative to the grub filesystem, which is normally /boot. Secondly, it expected return from inside eval{} to exit the function, when in fact it only exits the eval. ---

This removes another chunk of functionality from GuestOS. --- MANIFEST | 1 + lib/Sys/VirtV2V/Config.pm | 339 +++++++++++++++++++++++++++++++++++++ lib/Sys/VirtV2V/Converter.pm | 56 +----- lib/Sys/VirtV2V/GuestOS.pm | 94 ---------- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 46 ++++-- v2v/virt-v2v.pl | 96 +---------- 6 files

This change updates a guest which uses Xen's xvc0 to use ttyS0 instead. In a related change, it also makes a console a 'standard device' will always be configured. --- lib/Sys/VirtV2V/Converter.pm | 5 +++- lib/Sys/VirtV2V/Converter/Linux.pm | 46 ++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletions(-) diff --git

We previously wouldn't create a Config object if no config file was specified. This change ensures that a Config object is always created, but will do nothing interesting if there is no config file. Apart from being slightly cleaner, this allows information provided by Config to be later supplied from the command line instead. --- lib/Sys/VirtV2V/Config.pm | 34

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.

Move all target-specific functionality into its own module in preparation for output to RHEV. --- MANIFEST | 1 + lib/Sys/VirtV2V/Connection.pm | 46 ++--- lib/Sys/VirtV2V/Converter.pm | 138 +------------ lib/Sys/VirtV2V/Target/LibVirt.pm | 419 +++++++++++++++++++++++++++++++++++++ lib/Sys/VirtV2V/Transfer/ESX.pm | 91 +++------ po/POTFILES.in

Although I can't reproduce, I seem to have had an incomplete transfer which wasn't picked up by the existing error handling. This change adds some more sanity checks: * Check for error on close() (should have been doing this anyway) * Check that the bytes received == reported content length --- lib/Sys/VirtV2V/Transfer/ESX.pm | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1

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

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

We currently die with an error message if we can't find a Converter for a specific guest operating system. However, virt-v2v can still usefully transfer storage and metadata. This change turns the error into a (lengthy) warning, and continues with metadata conversion if guest conversion isn't possible. --- lib/Sys/VirtV2V/Converter.pm | 21 ++++++++++++++++++--- 1 files changed, 18

_is_installed was only checking if an existing package was newer than the target. If the package wasn't installed at all it was returning an error. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 9561338..8410ca2 100644 ---

This change replaces all direct usage of a Sys::Guestfs object in virt-v2v with a Sys::VirtV2V::GuestfsHandle proxy object. The proxy does 3 things: * Holds handle initialisation code * Adds the ability to explicitly close the handle * Adds the ability to register a callback to be executed before close The cleanup code in Sys::VirtV2V::Config is updated to use the new callback mechanism.

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