similar to: [PATCH] GuestOS: Fix augeas grub configuration

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

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

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

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

--- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index a973c19..6dc4c95 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -686,7 +686,7 @@ sub _get_installed error => $error))); } -

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

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

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

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

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

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

augeas now supports securetty. This resolves a failure when securetty isn't present in the guest. Resolves RHBZ#639413 --- lib/Sys/VirtV2V/Converter/Linux.pm | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/Sys/VirtV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index b2eb774..22aa03f 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++

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.

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

RHEL 3 doesn't have a dynamic /dev. kmod-virtio creates devices nodes for vdX block devices based on what the major number of virtblk was at the time it was installed. This is, in turn, based on the order the modules were loaded in initrd. To try to preserve this precarious state of affairs, when adding virtio drivers to a new initrd we always load the same drivers as kmod-virtio in the same

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 |

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

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

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