search for: grub_conf

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

...he checklist push (@checklist, '/files/etc/fstab/*/spec'); + push (@checklist, '/files/boot/*/device.map/*'. + '[label() != "#comment"]'); # Add grub or grub2 files to the checklist if (defined($grub->{grub_conf})) { push (@checklist, "/files$grub->{grub_conf}/*/kernel/root"); push (@checklist, "/files$grub->{grub_conf}/*/kernel/resume"); - push (@checklist, '/files/boot/grub/device.map/*'. - '[label() !...

...cfg ($g->glob_expand('/boot/*efi/*/grub.conf')) { + $self->check_efi(); + } + + # Look for the grub configuration file + foreach my $path ('/boot/grub/menu.lst', '/boot/grub/grub.conf') + { + if ($g->exists($path)) { + $self->{grub_conf} = $path; + last; + } + } + + # We can'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 di...

...($g->glob_expand('/boot/efi/EFI/*/grub.conf')) { + $self->check_efi(); + } + + # Look for the grub configuration file + foreach my $path ('/boot/grub/menu.lst', '/boot/grub/grub.conf') + { + if ($g->exists($path)) { + $self->{grub_conf} = $path; + last; + } + } + + # We can'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 di...

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

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

...:VirtConvert::Converter::Linux::GrubLegacy::ISA = + qw(Sys::VirtConvert::Converter::Linux::Grub); sub new { @@ -127,7 +197,8 @@ sub new # If it wasn't there, add it unless ($found) { - $g->aug_set("/augeas/load/Grub/incl[last()+1]", $self- >{grub_conf}); + $g->aug_set("/augeas/load/Grub/incl[last()+1]", + $self->{grub_conf}); # Make augeas pick up the new configuration $g->aug_load(); @@ -236,7 +307,7 @@ sub update_console sub check { my $self = shift; - m...

...verter/RedHat.pm index 36345e7..f1d3b98 100644 --- a/lib/Sys/VirtConvert/Converter/RedHat.pm +++ b/lib/Sys/VirtConvert/Converter/RedHat.pm @@ -247,7 +247,7 @@ sub check my $grub_path = $1; # Nothing to do if the kernel already has a grub entry - return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']") > 0; + return if $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']") ne ''; my $kernel = Sys::VirtConvert::Converter::RedHat::_inspect_linux_kernel($g, $path); -- 1.8.1.4

...all of these, and pushed. As it happens, I'd already started breaking some of this stuff out myself when I found this patchset :/ Rather than redo it, I've kept what I'd already done and rebased on top of it. I also did some testing and fixed a couple of bugs: "/files$grub->{grub_conf}*/kernel/root" should have been "/files $grub->{grub_conf}/*/kernel/root" in _remap_block_devices. It turns out that the release suffix used by RHEL 4 and 5 really is 'xen', not '-xen'. Note that this is the release, not the package name, which is what confused me...

...e=tty0 \ + netroot=iscsi:$OVIRT_ISCSI_TARGET_IP::$OVIRT_ISCSI_TARGET_PORT::$OVIRT_ISCSI_NODE_NAME ip=eth0:dhcp" + else: + bootparams="ro root=live:LABEL=Root roottypefs=ext3 console=tty0 \ + $(echo $bootparams | sed s/console=tty0//g)" + grub_config_file = "%s/grub.conf" % grub_dir + GRUB_CONFIG_TEMPLATE = """ +default=0 +timeout=5 +hiddenmenu +title oVirt Node (%(version)s-%(release)s) + root (hd0,%(partN)s) + kernel /vmlinuz0 %(bootparams)s + initrd /initrd0.img + """ + device_map_c...

...does get started and securetty is updated correctly. I'd like to propose that the converter add such kernel console= arguments if it doesn't find any to replace. Here is the current code: # Update any kernel console lines foreach my $augpath ($g->aug_match("/files$grub_conf/title/kernel/console")) { my $console = $g->aug_get($augpath); if ($console =~ /\b(x|h)vc0\b/) { $console =~ s/\b(x|h)vc0\b/ttyS0/g; $g->aug_set($augpath, $console); } } I'd imagine that if no matches are found, it should use a...

...the next level efi is lowercase. However, the minor efi changes are what I inherited (well, that and the copyright changes), so I have some more investigation to do here. > > + # Nothing to do if the kernel already has a grub entry > > + return if $g->aug_match("/files$grub_conf/title/kernel". > > + "[. = '$grub_path']") ne ''; > > I notice this is a change from RedHat.pm. Why did you add the "ne ''"? > Augeas will only return kernel entries, and I would expect a blank > kernel e...

...on > + foreach my $cfg ($g->glob_expand('/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; > + &g...

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 >

...dHat::Grub); +@Sys::VirtConvert::Converter::Linux::GrubLegacy::ISA = + qw(Sys::VirtConvert::Converter::Linux::Grub); sub new { @@ -236,7 +306,7 @@ sub update_console sub check { my $self = shift; - my ($path) = @_; + my ($path, $root) = @_; my $g = $self->{g}; my $grub_conf = $self->{grub_conf}; @@ -251,15 +321,17 @@ sub check return if scalar(@entries) > 0; my $kernel = - Sys::VirtConvert::Converter::RedHat::_inspect_linux_kernel($g, $path); + Sys::VirtConvert::Converter::Linux::_inspect_linux_kernel($g, $path); my $version = $ke...

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