[Libguestfs] [supermin] Be smarter about finding suitable kernel images

Hilko Bengen bengen at hilluzination.de
Mon Apr 28 19:15:33 UTC 2014


* 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
>> @@ -23,6 +23,19 @@ open Utils
>>  open Ext2fs
>>  open Fnmatch
>>  
>> +let patt_of_cpu host_cpu =
>> +  let models =
>> +    match host_cpu with
>> +    | "mips" | "mips64" -> [host_cpu; "*-malta"]
>> +    | "ppc" | "powerpc" -> ["ppc"; "powerpc"]

looks like I missed powerpc64.

>> +    | "sparc" | "sparc64" -> ["sparc"; "sparc64"]
>> +    | "amd64" | "x86_64" -> ["amd64"; "x86_64"]
>> +    | _ when host_cpu.[0] = 'i' && host_cpu.[2] = '8' && host_cpu.[3] = '6' -> ["?86"]
>> +    | _ when String.sub host_cpu 0 5 = "armv7" ->  ["armmp"]

This fails on short strings.

I have fixed those and added a fix so that device trees can be found on
Debian.

Cheers,
-Hilko




More information about the Libguestfs mailing list