search for: grub_fs

...nverter/RedHat.pm b/lib/Sys/VirtV2V/Converter/RedHat.pm index 0a4f829..d8f9141 100644 --- a/lib/Sys/VirtV2V/Converter/RedHat.pm +++ b/lib/Sys/VirtV2V/Converter/RedHat.pm @@ -1500,23 +1500,21 @@ sub _check_grub { my ($version, $kernel, $g, $desc) = @_; + my $grubfs = $desc->{boot}->{grub_fs}; + my $prefix = $grubfs eq '/boot' ? '' : '/boot'; + # Nothing to do if there's already a grub entry - eval { + return if eval { foreach my $augpath ($g->aug_match('/files/boot/grub/menu.lst/title/kernel')) { -...

...m @@ -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") { + if ($desc->{boot}->{grub_fs} eq "/boot") { $prefix = ''; } else { $prefix = '/boot'; @@ -1720,7 +1721,23 @@ sub prepare_bootable $g->modprobe('loop'); }; -...

...644 --- a/lib/Sys/VirtV2V/GuestOS/RedHat.pm +++ b/lib/Sys/VirtV2V/GuestOS/RedHat.pm @@ -350,39 +350,37 @@ sub get_default_kernel $default = $g->aug_get('/files/boot/grub/menu.lst/default'); }; + # Get the grub filesystem + my $grub = $self->{desc}->{boot}->{grub_fs}; + + # Look for a kernel, starting with the default + my @paths; + push(@paths, $g->aug_match("/files/boot/grub/menu.lst/". + "title[$default]/kernel")) if defined($default); + push(@paths, $g->aug_match('/files/boot/grub/menu...

...t continue without a config file + die unless defined ($self->{grub_conf}); + + # Find the path which needs to be prepended to paths in grub.conf to + # make them absolute + # Look for the most specific mount point discovered + + # Default to / (no prefix required) + $self->{grub_fs} ||= ""; + + my %mounts = $g->inspect_get_mountpoints($root); + foreach my $path ('/boot/grub', '/boot') { + if (exists($mounts{$path})) { + $self->{grub_fs} = $path; + last; + } + } + + # Initialise augeas + eval {...

...t continue without a config file + die unless defined ($self->{grub_conf}); + + # Find the path which needs to be prepended to paths in grub.conf to + # make them absolute + # Look for the most specific mount point discovered + + # Default to / (no prefix required) + $self->{grub_fs} ||= ""; + + my %mounts = $g->inspect_get_mountpoints($root); + foreach my $path ('/boot/grub', '/boot') { + if (exists($mounts{$path})) { + $self->{grub_fs} = $path; + last; + } + } + + # Initialise augeas + eval {...

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

...ys/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 ($g->aug_match('/files/boot/grub/menu.lst/title/kernel')) { - if($g->aug_get($kernel) eq "/...

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

...'/boot/*efi/*/grub.conf')) { I noticed you've changed this. Out of curiosity, where does SUSE mount it? > +sub check > +{ > + my $self = shift; > + my ($path) = @_; > + > + my $g = $self->{g}; > + my $grub_conf = $self->{grub_conf}; > + my $grub_fs = $self->{grub_fs}; > + $path =~ /^$grub_fs(.*)/ > + or v2vdie __x('Kernel {kernel} is not under grub tree {grub}', > + kernel => $path, grub => $grub_fs); > + my $grub_path = $1; > + > + # Nothing to do if the kernel already h...

...($@); return $augeas; } @@ -355,19 +408,28 @@ sub get_default_kernel eval { $default = $g->aug_get('/files/boot/grub/menu.lst/default'); }; + # Doesn't matter if get fails # Get the grub filesystem my $grub = $self->{desc}->{boot}->{grub_fs}; # Look for a kernel, starting with the default my @paths; - push(@paths, $g->aug_match("/files/boot/grub/menu.lst/". - "title[$default]/kernel")) if defined($default); - push(@paths, $g->aug_match('/files/boot/grub/menu...

The following series of patches adds support for converting SUSE guests through virt-v2v. These changes should not impact non-SUSE guest conversions. Mike Latimer (4): Add perl-Bootloader support to grub packages Add conversion support for SUSE guests Add SUSE to capabilities db and conf Add SUSE support documentation lib/Sys/VirtConvert/Converter/Linux.pm | 480

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

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