search for: kernel_pkg

...9 insertions(+), 37 deletions(-) diff --git a/lib/Sys/VirtV2V/GuestOS/RedHat.pm b/lib/Sys/VirtV2V/GuestOS/RedHat.pm index 77f0f3a..38a485c 100644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -475,7 +475,7 @@ sub add_kernel { my $self = shift; - my ($kernel_pkg, $kernel_arch) = $self->_discover_kernel(); + my ($kernel_pkg, $kernel_ver, $kernel_arch) = $self->_discover_kernel(); # If the guest is using a Xen PV kernel, choose an appropriate normal kernel # replacement @@ -547,56 +547,142 @@ sub add_kernel } } - my ($...

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

This change is part of an ongoing effort to remove use of $desc and inspect the OS directly as required during conversion. --- lib/Sys/VirtConvert/Connection/LibVirtTarget.pm | 4 +- lib/Sys/VirtConvert/Connection/RHEVTarget.pm | 41 +++++++++--------- lib/Sys/VirtConvert/Converter.pm | 35 ++++++++++++---- lib/Sys/VirtConvert/Converter/RedHat.pm | 45

...10948..dc0c285d 100644 --- a/v2v/linux_kernels.ml +++ b/v2v/linux_kernels.ml @@ -89,11 +89,19 @@ let detect_kernels (g : G.guestfs) inspect family bootloader = PCRE.compile "^initrd.img-.*$" else PCRE.compile "^initr(?:d|amfs)-.*(?:\\.img)?$" in + let kernel_pkgs = List.filter ( + fun { G.app2_name = name } -> + name = "kernel" + || String.is_prefix name "kernel-" + || String.is_prefix name "linux-image-" + ) inspect.i_apps in + if verbose () then ( + let names = List.map (fun { G.ap...

...el > + logmsg NOTICE, __x('virtio capable guest, but no virtio kernel found.') > + if ($virtio && !defined($boot_kernel)); > + > + # If none of the installed kernels are appropriate, install a new one > + if(!defined($boot_kernel)) { > + my ($kernel_pkg, $kernel_arch, undef) = > + _discover_kernel($g, $root, $grub); > + > + # If the guest is using a Xen PV kernel, choose an appropriate > + # normal kernel replacement > + if ($kernel_pkg eq "kernel-xen" || $kernel_pkg eq "kernel-xen-base&...

This is a new conversion module to convert SUSE Linux and openSUSE guests. The converter is based on the RedHat module, and should offer the same functionality on both SUSE and RedHat hosts. There are a few additional messages in this module, such as reporting of packages when installing through zypper or the local virt-v2v repo. These messages don't necessarily flow unless verbose switches

...installed virtio capable kernel + logmsg NOTICE, __x('virtio capable guest, but no virtio kernel found.') + if ($virtio && !defined($boot_kernel)); + + # If none of the installed kernels are appropriate, install a new one + if(!defined($boot_kernel)) { + my ($kernel_pkg, $kernel_arch, undef) = + _discover_kernel($g, $root, $grub); + + # If the guest is using a Xen PV kernel, choose an appropriate + # normal kernel replacement + if ($kernel_pkg eq "kernel-xen" || $kernel_pkg eq "kernel-xen-base") { + $ke...

...led die("virtio configured, but no virtio kernel found") if ($virtio && !defined($boot_kernel)); @@ -1013,7 +1155,7 @@ sub _configure_kernel # If the guest is using a Xen PV kernel, choose an appropriate # normal kernel replacement - if ($kernel_pkg eq "kernel-xen" || $kernel_pkg eq "kernel-xenU") { + if ($kernel_pkg =~ /^kernel-xen/) { $kernel_pkg = _get_replacement_kernel_name($g, $root, $kernel_arch, $meta); @@ -1055,7 +1197,7 @@ sub _configure...

...to install a virtio kernel next. + logmsg NOTICE, __x('virtio capable guest, but no virtio kernel found.') + if ($virtio && !defined($boot_kernel)); + + # If none of the installed kernels are appropriate, install a new one + if(!defined($boot_kernel)) { + my ($kernel_pkg, $kernel_arch, undef) = + _discover_kernel($g, $root, $grub); + + # If the guest is using a Xen PV kernel, choose an appropriate + # normal kernel replacement + if ($kernel_pkg =~ /^kernel-xen/) { + $kernel_pkg = _get_replacement_kernel_name($g, $root, +...

...}; + $backup_ver = $version; + } else { + $boot_kernel = $version; + } last; } @@ -1013,7 +1144,7 @@ sub _configure_kernel # If the guest is using a Xen PV kernel, choose an appropriate # normal kernel replacement - if ($kernel_pkg eq "kernel-xen" || $kernel_pkg eq "kernel-xenU") { + if ($kernel_pkg =~ /^kernel-xen/) { $kernel_pkg = _get_replacement_kernel_name($g, $root, $kernel_arch, $meta); @@ -1055,7 +1186,7 @@ sub _configure...

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

...::Basename; use Locale::TextDomain 'virt-v2v'; @@ -1055,7 +1055,7 @@ sub _configure_kernel unless defined($boot_kernel); } else { v2vdie __x('Failed to find a {name} package to install', - name => "kernel_pkg.$kernel_arch"); + name => "$kernel_pkg.$kernel_arch"); } } } @@ -1512,7 +1512,7 @@ sub _install_capability _get_replacement_kernel_name($g, $root, $kernel_arch,...

In preparation for an upcoming patch which adds support for SUSE guest conversions, it makes sense to have an intermediate steps that changes the RedHat.pm converter into a more generic Linux converter. The SUSE changes will then be limited in scope to only what is required for SUSE support. This series of patches accomplishes the following: - Renames RedHat.pm to Linux.pm - Modifies Linux.pm

On Friday, October 04, 2013 09:38:58 AM Matthew Booth wrote: > It's specifically an error if we're attempting to configure virtio, and > there's no detected virtio kernel. It shouldn't have been possible to > get here in that state, hence it's a programmer error. The code below > attempts to install *any* kernel in the case that we aren't configuring >

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

...b/Sys/VirtV2V/GuestOS/RedHat.pm @@ -475,17 +475,8 @@ sub add_kernel eval { my $desc = $self->{desc}; - my $config = $self->{config}; - unless (defined($config)) { - my $search = Sys::VirtV2V::Config::get_app_search - ($desc, $kernel_pkg, $kernel_arch); - die(user_message(__x("No config specified. No app match for ". - "{search}", - search => $search))); - } - ($app, $depnames) = - $config->match_app($desc...

...propriate, install a new one > @@ -1055,7 +1155,7 @@ sub _configure_kernel > unless defined($boot_kernel); > } else { > v2vdie __x('Failed to find a {name} package to install', > - name => "kernel_pkg.$kernel_arch"); > + name => "$kernel_pkg.$kernel_arch"); Thanks :) > @@ -1631,14 +1752,38 @@ sub _install_any > # If we're installing a kernel, check which kernels are there first > my @k_before = $g->glob_expand('/boot...

If a volume is not an exact multiple of 512 bytes, qemu-img will report its size rounded down to a 512 byte boundary. However, when copying, the file is still read until EOF, which will return more data than was expected. This change prevents that causing a failure in itself. The situation is still not resolved, however, as there are still situations where this will cause a failure. For example,

...')) > > { + $g->aug_set($path, 'cirrus'); > > I've changed the default to qxl now. SUSE still uses cirrus. > > + v2vdie __x('Failed to find a {name} package to install', > > + name => "$kernel_pkg"); > > This is $kernel_pkg.$kernel_arch in RedHat.pm. Is there any reason you > removed the arch? No reason, just didn't seem useful at that time. :) > > + $g->aug_rm("$entry"); > > $g->aug_rm($entry); Fixed. > > > +...

...sub add_kernel } } - my ($app, $deps); + my ($app, $depnames); eval { my $desc = $self->{desc}; @@ -475,7 +475,8 @@ sub add_kernel search => $search))); } - ($app, $deps) = $config->match_app($desc, $kernel_pkg, $kernel_arch); + ($app, $depnames) = + $config->match_app($desc, $kernel_pkg, $kernel_arch); }; # Return undef if we didn't find a kernel if ($@) { @@ -483,14 +484,12 @@ sub add_kernel return undef; } - return undef if($self->_is_instal...