From owner-svn-src-head@freebsd.org Mon Mar 26 23:32:26 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 6A5B9F5267C for ; Mon, 26 Mar 2018 23:32:26 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-yb0-x235.google.com (mail-yb0-x235.google.com [IPv6:2607:f8b0:4002:c09::235]) (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 0E1277D0AE for ; Mon, 26 Mar 2018 23:32:26 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by mail-yb0-x235.google.com with SMTP id u5-v6so6997088ybf.4 for ; Mon, 26 Mar 2018 16:32:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd-org.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=MRm5CYiIPgeyFUSYLkUs4HGJYz5my+AOuBXoK1F3IDI=; b=CharHPFCCBMJaLDpl3VUrD7u1zaiuoaC0Yk7wWJb3x6fCcmlrm9x9koWstbVgb1e6r mM72+ehznWWSZtItIjQulRAvaitWmofpKKUr7o673DazkOGVW4Dakdhpx11rkHmlswQQ /H5VOTLM8E4FfPIKUa7pOLisgjJvSmnPBWaMjwTNu2TSEjHk1dZbagXDhaQJ7tWyvqel ElXQ7/roxaz0Nxee9eghHXKtwm0OKzXu63ifnPDKQ0nagPxo9pYo0gRdLSY7d0LASwOV 4o0k2L7uNafMKrGx6ILdxESwHkxRF4SQ/elyG5NjsrXUW3NUe0YVAwNNSQRRmlXkR1uj RvBw== 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=MRm5CYiIPgeyFUSYLkUs4HGJYz5my+AOuBXoK1F3IDI=; b=MdT3anGIDu2ZpiBCJPFN2nxGZn5FGlXZYiZdgmwrdPaGcLQOR0UZ4TGU9u1IW6UUkJ ID7opLy6I8Hkjis/FM4YZnE/2SkYN994qHmmGtsvuiSs8G11slz6pnYcT4p6UddjDTh2 o5F27NdKXr92DWISwduni62V6OyhpIhLUq8wNwNipC4RroH3mRuD/kBicQnBxiBPYiSM g7TJboIgRvSPWZnThu3Ye2cp7gn1v6B+Lxc0iQnLH/PGPaGGnRKU2Nogl1X/AO/YJUu6 cUsxl+jDfOhVg5T6H3fqtHAc65EY21xfXeWuUUugRn7Xh7h3T1m5/8YiXgHvbEGPKRCw ocrQ== X-Gm-Message-State: AElRT7HKyT/r3cYoZqH2usKqpgeUvppR1ES78uxm/Hf35+vFb3rElEV1 qpMOkOGrWstBY0TXRVA4uQtC1eizz6FNgeJgP/GZag== X-Google-Smtp-Source: AG47ELv3HiCpk1dDppVbWv1i/RN9ml0xKPTLvRAGzZQUzAq/1MD12jV1j4eYQcE6Sa5lW3Ezpmp/1WpwCxtsp6SzTT8= X-Received: by 2002:a25:c791:: with SMTP id w139-v6mr24741567ybe.199.1522107145526; Mon, 26 Mar 2018 16:32:25 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a25:61c5:0:0:0:0:0 with HTTP; Mon, 26 Mar 2018 16:32:25 -0700 (PDT) In-Reply-To: <201801121530.w0CFUmE6095683@repo.freebsd.org> References: <201801121530.w0CFUmE6095683@repo.freebsd.org> From: Oliver Pinter Date: Tue, 27 Mar 2018 01:32:25 +0200 Message-ID: Subject: Re: svn commit: r327877 - head/usr.sbin/efibootmgr To: Warner Losh Cc: "svn-src-head@freebsd.org" , Kyle Evans Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.25 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: Mon, 26 Mar 2018 23:32:26 -0000 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 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" >