[Libguestfs] [PATCH v2 2/2] v2v: remove the 'graphicsmodedisabled' entry in ESP BCD

[Pavel Butsykin]

On 12.06.2016 20:26, Richard W.M. Jones wrote:
> Thanks, I pushed both patches.  Note you will get conflicts when you
> pull, since I have folded in some fixes, largely cosmetic, but there
> were two more important ones:
>
> (1) v2v_unit_tests: BIOS -> I_BIOS.  Please run the tests!
>

Thanks, next time I will use unit test.. But I had to strain to make 
them just work :)

> (2) The code below
>
>> +    let esp_temp_path = g#mkdtemp "/Windows/Temp/ESP_XXXXXX" in
>> +
>> +    match inspect.i_firmware with
>> +    | I_BIOS -> ()
>> +    | I_UEFI esp_list ->
>> +      List.iter (
>> +        fun dev_path ->
>> +        g#mount dev_path esp_temp_path;
>> +        fix_win_uefi_bcd esp_temp_path;
>> +        g#umount esp_temp_path;
>> +      ) esp_list;
>> +
>> +    g#rmdir esp_temp_path;
>
> doesn't do what you think.  The match statement extends all the way
> through to the g#rmdir, so g#rmdir will only be executed along the
> I_UEFI path.
>
> My solution to this was to move the g#mkdtemp into the I_UEFI path
> also, since we only want that directory when dealing with UEFI, not
> with BIOS.

I apologize for my carelessness.

>
> Thanks for your contributions,
>
> Rich.
>