From owner-svn-src-all@freebsd.org Fri Jun 8 14:35:28 2018 Return-Path: Delivered-To: svn-src-all@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 0A59C101C5D0; Fri, 8 Jun 2018 14:35:28 +0000 (UTC) (envelope-from gjb@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 B1D6884BD3; Fri, 8 Jun 2018 14:35:27 +0000 (UTC) (envelope-from gjb@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 8F5791054B; Fri, 8 Jun 2018 14:35:27 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w58EZRnT003319; Fri, 8 Jun 2018 14:35:27 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w58EZRNv003318; Fri, 8 Jun 2018 14:35:27 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806081435.w58EZRNv003318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 8 Jun 2018 14:35:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334839 - releng/11.2/release/amd64 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/release/amd64 X-SVN-Commit-Revision: 334839 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jun 2018 14:35:28 -0000 Author: gjb Date: Fri Jun 8 14:35:27 2018 New Revision: 334839 URL: https://svnweb.freebsd.org/changeset/base/334839 Log: Restore r332345 and r332346 from head, merged to stable/11 as part of r333006, which was reverted in r334735. r332345 fixes makefs(8) invocation after head revision r331843, where makefs(8) was updated to be in sync with NetBSD. r332346 fixes the $bootable variable position so the platformid option is correctly applied. This is a direct commit to releng/11.2, as these two revisions were part of a total of four revisions merge to stable/11 (at the time) in r333006. Approved by: re (bdrewery) Sponsored by: The FreeBSD Foundation Modified: releng/11.2/release/amd64/mkisoimages.sh Modified: releng/11.2/release/amd64/mkisoimages.sh ============================================================================== --- releng/11.2/release/amd64/mkisoimages.sh Fri Jun 8 14:00:12 2018 (r334838) +++ releng/11.2/release/amd64/mkisoimages.sh Fri Jun 8 14:35:27 2018 (r334839) @@ -38,7 +38,7 @@ if [ "x$1" = "x-b" ]; then umount efi rmdir efi mdconfig -d -u $device - bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable" + bootable="-o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi $bootable" shift else