search for: prepare_boot

...s(+), 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 @@ sub _configure_boot if($virtio) { $guestos->prepare_bootable($kernel, "virtio_pci", "virtio_blk"); } else { - $guestos->prepare_bootable($kernel); + $guestos->prepare_bootable($kernel, "sym53c8xx"); } } -- 1.6.6

...tV2V/Converter/Linux.pm b/lib/Sys/VirtV2V/Converter/Linux.pm index df7c969..6c50cd1 100644 --- a/lib/Sys/VirtV2V/Converter/Linux.pm +++ b/lib/Sys/VirtV2V/Converter/Linux.pm @@ -332,7 +332,13 @@ sub _configure_boot my ($guestos, $kernel, $virtio) = @_; if($virtio) { - $guestos->prepare_bootable($kernel, "virtio_pci", "virtio_blk"); + # The order of modules here is deliberately the same as the order + # specified in the postinstall script of kmod-virtio in RHEL3. The + # reason is that the probing order determines the major number of vdX +...

...21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 101a64b..74b9de1 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1639,13 +1639,14 @@ sub prepare_bootable my @modules = @_; my $g = $self->{g}; + my $desc = $self->{desc}; # Find the grub entry for the given kernel my $initrd; my $found = 0; eval { my $prefix; - if ($self->{desc}->{boot}->{grub_fs} eq "/boot") { +...

...tOS/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 +1114,13 @@ sub prepare_bootable $g->modprobe("ext2"); }; + # loop is a module in RHEL 5. Try to load it. Doesn't matter for other + # OSs if it doesn't exist, but RHEL 5 will complain: + # All of your loopback devices are in use. + eval { +...

...++++++++++++++++++++++--- 1 files changed, 110 insertions(+), 9 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 0e469f5..036f4eb 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -1043,10 +1043,17 @@ sub prepare_bootable my $initrd; my $found = 0; eval { + my $prefix; + if ($self->{desc}->{boot}->{grub_fs} eq "/boot") { + $prefix = ''; + } else { + $prefix = '/boot'; + } + foreach my $kernel...

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

...uot;.$map{$name}.$part); + } + $g->aug_save(); + }; + + $self->_augeas_error($@) if ($@); # Delete cached (and now out of date) blkid info if it exists foreach my $blkidtab ('/etc/blkid/blkid.tab', '/etc/blkid.tab') { @@ -1292,21 +1364,11 @@ sub prepare_bootable } } - eval { - $g->aug_save(); - }; - - if ($@) { - my $msg = ''; - foreach my $error ($g->aug_match('/augeas//error')) { - $msg .= $error.': '.$g->aug_get($error).&quot...

...s argument") - unless defined($guestos); - die("configure_boot called without kernel argument") - unless defined($kernel); - die("configure_boot called without virtio argument") - unless defined($virtio); if($virtio) { $guestos->prepare_bootable($kernel, "virtio_pci", "virtio_blk"); -- 1.6.6

...^$prefix([a-z]+)/ or die("drive $_ doesn't have prefix $prefix"); + $_ = $1; + } ($a, $b); + + return -1 if (length($a) < length($b)); + return 1 if (length($a) > length($b)); + + return -1 if ($a lt $b); + return 0 if ($a eq $b); + return 1; } =item prepare_bootable(version [, module, module, ...]) diff --git a/v2v/virt-v2v.pl b/v2v/virt-v2v.pl index eb5ba1f..7b389e4 100755 --- a/v2v/virt-v2v.pl +++ b/v2v/virt-v2v.pl @@ -262,13 +262,13 @@ my $dom = $conn->get_dom(); exit(1) unless(defined($dom)); # Get a list of the guest's transfered storage de...

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

...$spec ($g->aug_match('/etc/fstab/*/spec')) { + my $device = $g->aug_get($spec); + if(exists($map{$device})) { + $g->aug_set($spec, $map{$device}); + } + } + }; + + # Propagate augeas failure + die($@) if($@); +} + +sub prepare_bootable +{ + my $self = shift; + + my $version = shift; + my @drivers = @_; + + my $g = $self->{g}; + + # Find the grub entry for the given kernel + my $initrd; + my $found = 0; + eval { + foreach my $kernel + ($g->aug_match('/files/boot/grub/grub...

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