From owner-svn-src-head@freebsd.org  Tue Apr 10 02:49:54 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:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7280CF95EC1;
 Tue, 10 Apr 2018 02:49:54 +0000 (UTC)
 (envelope-from benno@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 1F0137A2AB;
 Tue, 10 Apr 2018 02:49:54 +0000 (UTC)
 (envelope-from benno@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 1401C2769D;
 Tue, 10 Apr 2018 02:49:54 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3A2nra7038915;
 Tue, 10 Apr 2018 02:49:53 GMT (envelope-from benno@FreeBSD.org)
Received: (from benno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3A2nrqV038914;
 Tue, 10 Apr 2018 02:49:53 GMT (envelope-from benno@FreeBSD.org)
Message-Id: <201804100249.w3A2nrqV038914@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: benno set sender to
 benno@FreeBSD.org using -f
From: Benno Rice <benno@FreeBSD.org>
Date: Tue, 10 Apr 2018 02:49:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332346 - head/release/amd64
X-SVN-Group: head
X-SVN-Commit-Author: benno
X-SVN-Commit-Paths: head/release/amd64
X-SVN-Commit-Revision: 332346
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: Tue, 10 Apr 2018 02:49:54 -0000

Author: benno
Date: Tue Apr 10 02:49:53 2018
New Revision: 332346
URL: https://svnweb.freebsd.org/changeset/base/332346

Log:
  Fix the position of $bootable so that -o platformid=efi applies correctly.
  
  Sponsored by:	iXsystems, Inc.
  Pointy hat to:	benno (again)

Modified:
  head/release/amd64/mkisoimages.sh

Modified: head/release/amd64/mkisoimages.sh
==============================================================================
--- head/release/amd64/mkisoimages.sh	Tue Apr 10 02:43:07 2018	(r332345)
+++ head/release/amd64/mkisoimages.sh	Tue Apr 10 02:49:53 2018	(r332346)
@@ -38,7 +38,7 @@ if [ "$1" = "-b" ]; then
 	umount efi
 	rmdir efi
 	mdconfig -d -u $device
-	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable -o platformid=efi"
+	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi $bootable"
 	
 	shift
 else