search for: grub_path

...le changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Sys/VirtConvert/Converter/RedHat.pm b/lib/Sys/VirtConvert/Converter/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 '';...

...ile = + if g#exists file then + true + else ( + info (f_"Can't find file: '%s' needed for UEFI fixing") + file; + false ) + in + + let grub_config = bootloader#get_config_file () in + + let grub_path = + String.sub grub_config 0 (String.rindex grub_config '/') in + + if g#exists uefi_fallback_name then + (* don't do anything if uefi fallback exists *) + () + else ( + info (f_"Fixing UEFI bootloader."); + match insp...

...'t fix UEFI bootloader. VM may not boot."); + "" ) in + + let file_exists file = + if g#exists file then + true + else ( + info (f_"Can't find file: '%s' needed for UEFI bootloader fixing") file; + false ) in + + let grub_path = String.sub grub_config 0 (String.rindex grub_config '/') in + let uefi_fallback_name = + let arch_suffix = get_uefi_arch_suffix arch in + if arch_suffix <> "" then + String.concat "" [uefi_fallback_path; "BOOT"; arch_suffix; ".E...

...; + + 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 has a grub entry + return if $g->aug_match("/files$grub_conf/title/kernel". + "[. = '$grub_path']") ne ''; + + my $kernel = + Sys::VirtConvert::Converter::SUSE::_inspect...

...; > + 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 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 y...

...; + + 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 has a grub entry + my @entries = $g->aug_match("/files$grub_conf/title/kernel". + "[. = '$grub_path']"); + return if scalar(@entries) > 0; + + my $kernel = + Sys::VirtConv...

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

...(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 entry to be a parse error, hence this would be redundant. In my testing (and according...

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 >

...up the new configuration $g->aug_load(); @@ -236,7 +307,7 @@ sub update_console sub check { my $self = shift; - my ($path) = @_; + my ($path, $root) = @_; my $g = $self->{g}; my $grub_conf = $self->{grub_conf}; @@ -247,19 +318,22 @@ sub check my $grub_path = $1; # Nothing to do if the kernel already has a grub entry - my @entries = $g->aug_match("/files$grub_conf/title/kernel[. = '$grub_path']"); + my @entries = $g->aug_match("/files$grub_conf/title/kernel". + "[. = '...