From owner-svn-src-head@freebsd.org Tue Mar 27 00:41:14 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13FB9F5908D for ; Tue, 27 Mar 2018 00:41:14 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7845B7FEBF; Tue, 27 Mar 2018 00:41:13 +0000 (UTC) (envelope-from byond.lenox@gmail.com) Received: by mail-lf0-f45.google.com with SMTP id x205-v6so30791227lfa.0; Mon, 26 Mar 2018 17:41:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=KakVayuB50Q1W7yvOy/updL3DDKR944M1GUWOTrLlBE=; b=A+5WJClESPhCTceU7vhhE/ibyx/1a8P06gCvGyCaadKSPu6NvUVZbsar5W0odqsQuh ec7c9uoYwmBXmYJsx2QhS1mU30EB3rMsBelMxJvDJbYTAQ9Y7e4QAVFOC6XDboaHwJR8 8y0/i2DuQ+Ko0JAMhoM+sLsTi+Y/b4Dju8ECR+g8VtigDSoSsuN6tCzk2Ncav52KE8sK lXQSvkZQ1rYjus6C4Qa1JL/PcbfFK7qGGlQNZ5lJSeB/FW+ss/fCzhRFCPPA0pyv2sQ8 i+A3ssgBCMv0Csr+4UiEnODTM0ANrT1Gp5YkCHY/o3Y8LpdxOJo4/mjZEJcbCOnjFsWa bqag== X-Gm-Message-State: AElRT7GF3pDpUwplFmGf+gJ0o6Le5EqKVioO4i0PeuTDwGOuRmQJxxQR CKg+qLNi0ow4KhnXwC/nLue7Rc8/ X-Google-Smtp-Source: AG47ELs9aPhyEIwV9SzxS5tOBrT+j4/68cluWCjj9rNpqAABmHV3sDN2ANEYfnk54MBwhsfgfAiIrw== X-Received: by 10.46.71.12 with SMTP id u12mr21036338lja.36.1522111265399; Mon, 26 Mar 2018 17:41:05 -0700 (PDT) Received: from mail-lf0-f53.google.com (mail-lf0-f53.google.com. [209.85.215.53]) by smtp.gmail.com with ESMTPSA id x17-v6sm3197lfi.30.2018.03.26.17.41.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 17:41:05 -0700 (PDT) Received: by mail-lf0-f53.google.com with SMTP id p142-v6so30761786lfd.6; Mon, 26 Mar 2018 17:41:05 -0700 (PDT) X-Received: by 2002:a19:6919:: with SMTP id e25-v6mr27139443lfc.52.1522111265105; Mon, 26 Mar 2018 17:41:05 -0700 (PDT) MIME-Version: 1.0 Received: by 10.46.129.90 with HTTP; Mon, 26 Mar 2018 17:40:44 -0700 (PDT) In-Reply-To: References: <201801121530.w0CFUmE6095683@repo.freebsd.org> From: Kyle Evans Date: Mon, 26 Mar 2018 19:40:44 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r327877 - head/usr.sbin/efibootmgr To: Oliver Pinter Cc: Warner Losh , "svn-src-head@freebsd.org" Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 00:41:14 -0000 On Mon, Mar 26, 2018 at 6:32 PM, Oliver Pinter wrote: > On Friday, January 12, 2018, Warner Losh 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