search for: kernel_file

This patch series fixes several problems in the way that supermin handles kernels. The most pressing problem is that supermin doesn't handle bogus vmlinuz files which aren't actual kernels. Along the way there is a lot of clean up. The patches look much better if you view them with ‘-w’. This series will require plenty of time to be tested in Fedora, especially on non-x86 arches.

...rnel.ml +++ b/src/format_ext2_kernel.ml @@ -93,12 +93,16 @@ and find_kernel_from_lib_modules debug = let files = glob "/lib/modules/*/vmlinuz" [GLOB_NOSORT; GLOB_NOESCAPE] in let files = Array.to_list files in let kernels = - List.map ( + filter_map ( fun kernel_file -> - let kernel_name = Filename.basename kernel_file in - let modpath = Filename.dirname kernel_file in - let kernel_version = Filename.basename modpath in - kernel_file, kernel_name, kernel_version, modpath + let size = try (stat kernel_file).st_size...

...ath debug kernel_version in - - if debug >= 1 then ( - printf "supermin: kernel: kernel_version %s\n" kernel_version; - printf "supermin: kernel: modules %s\n%!" modpath; - ); - - (kernel_version, modpath) - -and find_kernel debug host_cpu copy_kernel kernel = - let kernel_file, kernel_name, kernel_version = + let kernel_file, kernel_name, kernel_version, modpath = try let kernel_env = getenv "SUPERMIN_KERNEL" in if debug >= 1 then @@ -78,38 +57,58 @@ and find_kernel debug host_cpu copy_kernel kernel = printf "supermin: kerne...

...e f, Filename.basename modpath, modpath + ) files in + List.sort ( + fun (_, _, a, _) (_, _, b, _) -> compare_version b a + ) kernels in + + if kernels <> [] then ( + let kernel = List.hd kernels in + if debug >= 1 then ( + let kernel_file, _, _, _ = kernel in + printf "supermin: kernel: picked vmlinuz %s\n%!" kernel_file; + ); + kernel + ) else + find_kernel debug host_cpu kernel in (* If the user passed --dtb option, locate dtb. *) (match dtb_wildcard with -- 2.7.4

...[] then no_kernels (); + if files = [] then no_kernels (host_cpu); let files = List.sort (fun a b -> compare_version b a) files in let kernel_name = List.hd files in @@ -95,10 +103,13 @@ and find_kernel debug host_cpu copy_kernel kernel = copy_or_symlink_file copy_kernel kernel_file kernel; kernel_name, kernel_version -and kernel_filter patt is_arm all_files = +and kernel_filter patterns is_arm all_files = let files = List.filter - (fun filename -> fnmatch patt filename [FNM_NOESCAPE]) all_files in + (fun filename -> + List.exists +...

* Richard W.M. Jones: > On Sat, Apr 26, 2014 at 02:27:07PM +0200, Hilko Bengen wrote: >> --- >> src/kernel.ml | 43 ++++++++++++++++++++++++++++--------------- >> 1 file changed, 28 insertions(+), 15 deletions(-) >> >> diff --git a/src/kernel.ml b/src/kernel.ml >> index ed5aea3..436b1b0 100644 >> --- a/src/kernel.ml >> +++ b/src/kernel.ml

Hi Rich But there is no src/kernel.ml file on my ubuntu powerpc to which the above patch is reffering. I have installed supermin as supermin_5.1.8-2_powerpc.deb debian package. Thanks On Tue, Jun 3, 2014 at 7:16 PM, Richard W.M. Jones <rjones@redhat.com> wrote: > On Tue, Jun 03, 2014 at 06:55:49PM +0530, abhishek jain wrote: > > supermin: failed to find a suitable kernel

...if debug >= 1 then ( > printf "supermin: kernel: kernel_version %s\n" kernel_version; > printf "supermin: kernel: modules %s\n%!" modpath; > ); > > (kernel_version, modpath) > > and find_kernel debug host_cpu copy_kernel kernel = > let kernel_file, kernel_name, kernel_version = > try > let kernel_env = getenv "SUPERMIN_KERNEL" in > if debug >= 1 then > printf "supermin: kernel: SUPERMIN_KERNEL environment variable > %s\n%!" > kernel_env; > let kernel_version...

Document what each module does, using *.mli files. Remove the --dtb option, it's obsolete. Rename modules according to their purpose. Rich.

...ath debug kernel_version in + + if debug >= 1 then ( + printf "supermin: kernel: kernel_version %s\n" kernel_version; + printf "supermin: kernel: modules %s\n%!" modpath; + ); + + (kernel_version, modpath) + +and find_kernel debug host_cpu copy_kernel kernel = + let kernel_file, kernel_name, kernel_version = + try + let kernel_env = getenv "SUPERMIN_KERNEL" in + let kernel_version = get_kernel_version_from_kernel kernel_env in + if debug >= 1 then + printf "supermin: kernel: SUPERMIN_KERNEL environment variable = %s\n%!" +...