search for: grub_kernel

...# For every kernel we find, inspect it and add to $os->{kernels} + my $grub = _find_grub_prefix($g, $os); + my @boot_configs; # We want @@ -1474,7 +1526,7 @@ sub _check_for_kernels # Check we've got a kernel entry if(defined($grub_kernel)) { - my $path = "/boot$grub_kernel"; + my $path = "$grub$grub_kernel"; # Reconstruct the kernel command line my @args = (); @@ -1508,7 +1560,7 @@ sub _check_for_kernels unless($@) {...

...;, 16); + + my @configs = (); + # Get all configurations from grub + foreach my $bootable + ($g->aug_match("/files/etc/grub.conf/title")) + { + my %config = (); + $config{title} = $g->aug_get($bootable); + + my $grub_kernel; + eval { + $grub_kernel = $g->aug_get("$bootable/kernel"); + }; + if($@) { + warn __x("Grub entry {title} has no kernel", + title => $config{title}); + } - my $osn = $os...

This is a sort of follow-up to the Linux_bootloaders patch. It turns out all the kernel detection code is nicely self- contained and can therefore be moved to its own module. Rich.

...s = [] then - error (f_"no installed kernel packages were found.\n\nThis probably indicates that %s was unable to inspect this guest properly.") - prog; - - (* Now the difficult bit. Get the grub kernels. The first in this - * list is the default booting kernel. - *) - let grub_kernels : kernel_info list = - let vmlinuzes = bootloader#list_kernels in - - (* Map these to installed kernels. *) - filter_map ( - fun vmlinuz -> - try - let statbuf = g#statns vmlinuz in - let kernel = - List.find ( - fun { ki_vmlinuz_st...

This is a repost of the patch I sent on Friday. I know it was already ACK'd, but I've changed a fair bit in addition to adding the requested POD. Specifically: I discovered that augeas's grub lens wasn't returning cmdline the way I expected. This is fixed. The kernel package, if known, is output as a property of the kernel. The XML output of virt-inspector is updated with all

...k2.ki_app + else ( + let i = compare_app2_versions k1.ki_app k2.ki_app in + if i <> 0 then i + (* Favour non-debug kernels over debug kernels (RHBZ#1170073). *) + else compare k2.ki_is_debug k1.ki_is_debug in + ) in let kernels = grub_kernels in let kernels = List.filter (fun { ki_is_xen_kernel = is_xen_kernel } -> not is_xen_kernel) kernels in -- 2.1.0

...ages were found.\n\nThis probably indicates that %s was unable to inspect this guest properly") prog; (* Now the difficult bit. Get the grub kernels. The first in this @@ -376,7 +376,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = ); if grub_kernels = [] then - error (f_"no kernels were found in the grub configuration.\n\nThis probably indicates that %s was unable to parse the grub configuration of this guest.") + error (f_"no kernels were found in the grub configuration.\n\nThis probably indicates that %s was unable to p...

Since v2: - Use string_suffix kernel_name "-debug" || string_suffix kernel_name "-dbg" - This requires addition of the string_suffix function and some tests

...ns(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index 7829612..e1a769b 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -240,7 +240,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * list is the default booting kernel. *) let grub_kernels : kernel_info list = - let vmlinuzes = bootloader#list_kernels () in + let vmlinuzes = bootloader#list_kernels in (* Map these to installed kernels. *) filter_map ( diff --git a/v2v/linux_bootloaders.ml b/v2v/linux_bootloaders.ml index d12edf8..f41947e 100644 --- a/v2v/linux_boot...

...tloader g inspect in (* What kernel/kernel-like packages are installed on the current guest? *) let installed_kernels : kernel_info list = @@ -269,88 +241,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * list is the default booting kernel. *) let grub_kernels : kernel_info list = - (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) - let remove_hd_prefix = - let rex = Str.regexp "^(hd.*)\\(.*\\)" in - Str.replace_first rex "\\1" - in - - let vmlinuzes = - match grub with - | `Grub1 -&...

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

...pp k2.ki_app + else ( + let i = compare_app2_versions k1.ki_app k2.ki_app in + if i <> 0 then i + (* Favour non-debug kernels over debug kernels (RHBZ#1170073). *) + else compare k2.ki_is_debug k1.ki_is_debug + ) in let kernels = grub_kernels in let kernels = List.filter (fun { ki_is_xen_kernel = is_xen_kernel } -> not is_xen_kernel) kernels in -- 2.1.0

...(* What kernel/kernel-like packages are installed on the current guest? *) > let installed_kernels : kernel_info list = > @@ -269,88 +241,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = > * list is the default booting kernel. > *) > let grub_kernels : kernel_info list = > - (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) > - let remove_hd_prefix = > - let rex = Str.regexp "^(hd.*)\\(.*\\)" in > - Str.replace_first rex "\\1" > - in > - > - let vmlinuzes = > -...

...nux.augeas_reload g; (* What kernel/kernel-like packages are installed on the current guest? *) let installed_kernels : kernel_info list = @@ -276,88 +240,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = * list is the default booting kernel. *) let grub_kernels : kernel_info list = - (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) - let remove_hd_prefix = - let rex = Str.regexp "^(hd.*)\\(.*\\)" in - Str.replace_first rex "\\1" - in - - let vmlinuzes = - match grub with - | `Grub1 -&...

...ct_bootloader g inspect in (* What kernel/kernel-like packages are installed on the current guest? *) let installed_kernels : kernel_info list = @@ -270,88 +241,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = * list is the default booting kernel. *) let grub_kernels : kernel_info list = - (* Helper function for SUSE: remove (hdX,X) prefix from a path. *) - let remove_hd_prefix = - let rex = Str.regexp "^(hd.*)\\(.*\\)" in - Str.replace_first rex "\\1" - in - - let vmlinuzes = - match grub with - | `Grub1 -&...

Hi Rich, This series includes patches to make `make syntax-check` pass. Some of the fix require change to maint.mk, but the file is not in git repo. Is it intended? Thanks! Hu Tao (13): syntax-check: dirty hack to pass bindtextdomain check syntax-check: fix error_message_period check syntax-check: fix makefile_at_at_check syntax-check: fix prohibit_assert_without_use check