Date: Mon, 26 Mar 2018 19:40:44 -0500 From: Kyle Evans <kevans@freebsd.org> To: Oliver Pinter <oliver.pinter@hardenedbsd.org> Cc: Warner Losh <imp@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r327877 - head/usr.sbin/efibootmgr Message-ID: <CACNAnaEGuHsTrTEYtO%2BgSRdb-4uChacG%2Bxq%2BQWkkJYp%2BYEWRQg@mail.gmail.com> In-Reply-To: <CAPQ4ffsUhLFVPkhZaDgANTzVKYdseSdEsfuXJ3NwD7QHuNR1hg@mail.gmail.com> References: <201801121530.w0CFUmE6095683@repo.freebsd.org> <CAPQ4ffsUhLFVPkhZaDgANTzVKYdseSdEsfuXJ3NwD7QHuNR1hg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Mar 26, 2018 at 6:32 PM, Oliver Pinter <oliver.pinter@hardenedbsd.org> wrote: > On Friday, January 12, 2018, Warner Losh <imp@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@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/svn-src-head >> To unsubscribe, send any mail to "svn-src-head-unsubscribe@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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACNAnaEGuHsTrTEYtO%2BgSRdb-4uChacG%2Bxq%2BQWkkJYp%2BYEWRQg>