forked from pool/supermin
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
|
References: bsc#1187532 - virt-make-fs hangs forever
|
||
|
|
|
||
|
|
Index: supermin-5.2.2/src/format_ext2_kernel.ml
|
||
|
|
===================================================================
|
||
|
|
--- supermin-5.2.2.orig/src/format_ext2_kernel.ml
|
||
|
|
+++ supermin-5.2.2/src/format_ext2_kernel.ml
|
||
|
|
@@ -129,7 +129,7 @@ and find_kernel_from_boot debug host_cpu
|
||
|
|
if files <> [] then files
|
||
|
|
else (
|
||
|
|
(* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *)
|
||
|
|
- let files = files_matching_globs ["vmlinu?-*"] all_files in
|
||
|
|
+ let files = files_matching_globs ["vmlinu?-*"; "Image-*"] all_files in
|
||
|
|
let files = ignore_unbootable_kernels host_cpu files in
|
||
|
|
files
|
||
|
|
) in
|
||
|
|
@@ -235,9 +235,14 @@ and get_kernel_version debug kernel_file
|
||
|
|
else (
|
||
|
|
basename
|
||
|
|
) in
|
||
|
|
- if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" basename
|
||
|
|
+ if string_prefix "vmlinuz-" basename || string_prefix "vmlinux-" basename || string_prefix "Image-" basename
|
||
|
|
then (
|
||
|
|
- let version = String.sub basename 8 (String.length basename - 8) in
|
||
|
|
+ let version =
|
||
|
|
+ if string_prefix "Image-" basename then (
|
||
|
|
+ String.sub basename 6 (String.length basename - 6)
|
||
|
|
+ ) else (
|
||
|
|
+ String.sub basename 8 (String.length basename - 8)
|
||
|
|
+ ) in
|
||
|
|
(* Does the version look reasonable? *)
|
||
|
|
let modpath = "/lib/modules" // version in
|
||
|
|
if has_modpath modpath then (
|