svn commit: r327877 - head/usr.sbin/efibootmgr

[Kyle Evans]

On Mon, Mar 26, 2018 at 6:32 PM, Oliver Pinter
<oliver.pinter at hardenedbsd.org> wrote:
> On Friday, January 12, 2018, Warner Losh <imp at freebsd.org> wrote:
>>
>> Author: imp
>> Date: Fri Jan 12 15:30:48 2018
>> New Revision: 327877
>> URL: https://svnweb.freebsd.org/changeset/base/327877
>>
>> Log:
>>   Fix error in determining the next available boot slot.
>>
>>   Sponsored by: Netflix
>>
>> Modified:
>>   head/usr.sbin/efibootmgr/efibootmgr.c
>>
>> Modified: head/usr.sbin/efibootmgr/efibootmgr.c
>>
>> ==============================================================================
>> --- head/usr.sbin/efibootmgr/efibootmgr.c       Fri Jan 12 14:01:38 2018
>> (r327876)
>> +++ head/usr.sbin/efibootmgr/efibootmgr.c       Fri Jan 12 15:30:48 2018
>> (r327877)
>> @@ -563,7 +563,7 @@ make_next_boot_var_name(void)
>>         } else {
>>                 /* now just run the list looking for the first hole */
>>                 for (i = 0; i < cnt - 1 && next_free == 0; i++)
>> -                       if (vals[i] != vals[i + 1] + 1)
>> +                       if (vals[i] + 1 != vals[i + 1])
>>                                 next_free = vals[i] + 1;
>>                 if (next_free == 0)
>>                         next_free = vals[cnt - 1] + 1;
>> _______________________________________________
>> svn-src-head at freebsd.org mailing list
>> https://lists.freebsd.org/mailman/listinfo/svn-src-head
>> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"
>
> Hi Warner!
>
> Did you plan to MFC this to 11-stable? I think other parts (both kernel and
> loader parts are mostly MFCd back by Kyle).
>
> Thanks,
> Oliver

If Warner has no plans or doesn't get to it by April 4th (date
mentioned in my call for testing [1] to -current@), I'll go ahead and
sweep up any outstanding efibootmgr/efivar MFC's along with the rest
of my EFI changes (SetVirtualAddressMap, GOP setting). As of now, I'm
still intending to hit my target and MFC these on April 4th since
testing has boiled out some of the more subtle EFIRT gotchas (like the
SYSINIT ordering).

[1] https://lists.freebsd.org/pipermail/freebsd-current/2018-March/068908.html