Re: [Libguestfs] [PATCH] supermin: Fix IBM Virtual SCSI driver name

Gustavo Luiz Duarte
2020-04-01T17:32:55Z

On 4/1/20 7:10 AM, Richard W.M. Jones wrote:
> On Tue, Mar 31, 2020 at 11:11:44PM -0300, Gustavo Luiz Duarte wrote:
>> The driver was renamed from ibmvscsic to ibmvscsi on kernel 3.7.
>> See
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9965c2f19be470c452357ae4f6304467cdeada55
>>
>> The old name is kept so supermin works with recent kernels as well as
kernel
>> version older than 3.7.
>> ---
>>   src/format_ext2_initrd.ml | 1 +
>>   1 file changed, 1 insertion(+)
>>
>> diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml
>> index b67bb55..38977e6 100644
>> --- a/src/format_ext2_initrd.ml
>> +++ b/src/format_ext2_initrd.ml
>> @@ -44,6 +44,7 @@ let kmods = [
>>     "crc*.ko*";
>>     "libcrc*.ko*";
>>     "ibmvscsic.ko*";
>> +  "ibmvscsi.ko*";
>>     "libnvdimm.ko*";
>>     "nd_pmem.ko*";
>>     "nd_btt.ko*";
>
> We could have used a wildcard here, but this works too.


I considered using a wildcard, but I didn't immediately find a pattern
to include ibmvscsi.ko and ibmvscsic.ko but not ibmvscsis.ko, which we
don't need. I could do it by using fnmatch's flag FNM_EXTMATCH, but that
would require enabling GNU extensions in supermin... which seemed
unnecessary.


> Anyway
> I have pushed it upstream, thanks.


Thanks!


[]'s
Gustavo