similar to: [PATCH] Workaround issue where grubby fails when run under libguestfs

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

Handle the case where grub refers to a kernel which doesn't exist by ignoring that kernel. --- lib/Sys/VirtV2V/GuestOS/RedHat.pm | 46 +++++++++++++++++------------------- 1 files changed, 22 insertions(+), 24 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 77d9332..10ff77d 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++

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

This is a proposed patch which changes the RedHat.pm converter to Linux.pm, and adds support for SUSE guest conversion. This is first approach recommended by Matt Booth in: https://www.redhat.com/archives/libguestfs/2013-September/msg00076.html Some aspects of this patch still need additional testing, and a couple of changes are not foolproof (such as the lack of grub2 support in the menu.lst

The SUSE converter itself, based on the RedHat converter. This supports converting SLES 10/11 and openSUSE 10/11/12/13. --- MANIFEST | 1 + lib/Sys/VirtConvert/Converter/SUSE.pm | 2527 +++++++++++++++++++++++++++++++++ 2 files changed, 2528 insertions(+) diff --git a/MANIFEST b/MANIFEST index 3724fde..615ec32 100644 --- a/MANIFEST +++ b/MANIFEST @@ -17,6 +17,7

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

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

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

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

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

Create an object hierarchy to represent different bootloaders for Linux guests, moving the separate handling of grub1 and grub2 in different classes. This will allow us to support more bootloaders in the future. This is mostly code refactoring, with no actual behaviour change. --- po/POTFILES-ml | 1 + v2v/Makefile.am | 2 + v2v/bootloaders.ml | 317

On Mon, Aug 15, 2016 at 04:48:29PM +0200, Pino Toscano wrote: > Create an object hierarchy to represent different bootloaders for Linux > guests, moving the separate handling of grub1 and grub2 in different > classes: this isolates the code for each type of bootloader together, > instead of scattering it all around. > > This is mostly code refactoring, with no actual behaviour

> On 7 Nov 2016, at 22:16, Derek Atkins <derek@ihtfp.com> wrote: > > Hi, > > My last VM imported in 2 minutes. This one has been sitting for three > hours. I think this is a bug. well, some time it does take a long time. Are you sure it was hung? No I/O going on? adding libguestfs list Thanks, michal > > Just in case it helps, here's a larger piece of

This implements the structure and most of the functionality of the initial virt-v2v tool. --- perl/lib/Sys/Guestfs/GuestOS.pm | 97 ++++ perl/lib/Sys/Guestfs/GuestOS/RedHat.pm | 506 +++++++++++++++++++++ perl/lib/Sys/Guestfs/HVSource.pm | 132 ++++++ perl/lib/Sys/Guestfs/HVSource/Xen/Linux.pm | 141 ++++++ perl/lib/Sys/Guestfs/HVTarget.pm

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

Create an object hierarchy to represent different bootloaders for Linux guests, moving the separate handling of grub1 and grub2 in different classes: this isolates the code for each type of bootloader together, instead of scattering it all around. This is mostly code refactoring, with no actual behaviour change. --- po/POTFILES-ml | 1 + v2v/Makefile.am | 2 +

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