From owner-svn-src-head@freebsd.org  Fri Jan 12 15:30:49 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A786BE6B221;
 Fri, 12 Jan 2018 15:30:49 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 80A5D6FDA6;
 Fri, 12 Jan 2018 15:30:49 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C1EEA25730;
 Fri, 12 Jan 2018 15:30:48 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0CFUm1F095684;
 Fri, 12 Jan 2018 15:30:48 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0CFUmE6095683;
 Fri, 12 Jan 2018 15:30:48 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201801121530.w0CFUmE6095683@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 12 Jan 2018 15:30:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r327877 - head/usr.sbin/efibootmgr
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/usr.sbin/efibootmgr
X-SVN-Commit-Revision: 327877
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 Jan 2018 15:30:49 -0000

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;