From owner-svn-src-head@freebsd.org  Tue Jul  3 16:07:05 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 A9B99102D350;
 Tue,  3 Jul 2018 16:07:05 +0000 (UTC) (envelope-from ian@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 5C29A894C7;
 Tue,  3 Jul 2018 16:07:05 +0000 (UTC) (envelope-from ian@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 3D5931E4C4;
 Tue,  3 Jul 2018 16:07:05 +0000 (UTC) (envelope-from ian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w63G75ln048065;
 Tue, 3 Jul 2018 16:07:05 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w63G75gh048064;
 Tue, 3 Jul 2018 16:07:05 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201807031607.w63G75gh048064@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Tue, 3 Jul 2018 16:07:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335895 - head/tools/boot
X-SVN-Group: head
X-SVN-Commit-Author: ian
X-SVN-Commit-Paths: head/tools/boot
X-SVN-Commit-Revision: 335895
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.27
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, 03 Jul 2018 16:07:05 -0000

Author: ian
Date: Tue Jul  3 16:07:04 2018
New Revision: 335895
URL: https://svnweb.freebsd.org/changeset/base/335895

Log:
  Fix the fstab entries for tests that have an efi partition in slice 1 and
  put the rootfs on s2.

Modified:
  head/tools/boot/rootgen.sh

Modified: head/tools/boot/rootgen.sh
==============================================================================
--- head/tools/boot/rootgen.sh	Tue Jul  3 15:56:22 2018	(r335894)
+++ head/tools/boot/rootgen.sh	Tue Jul  3 16:07:04 2018	(r335895)
@@ -237,7 +237,7 @@ mk_nogeli_mbr_ufs_uefi() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0s1a	/		ufs	rw	1	1
+/dev/ada0s2a	/		ufs	rw	1	1
 EOF
     make_esp ${src} ${img}.s1
     makefs -t ffs -B little -s 200m ${img}.s2a ${src}
@@ -251,7 +251,7 @@ mk_nogeli_mbr_ufs_both() {
     img=$2
 
     cat > ${src}/etc/fstab <<EOF
-/dev/ada0s1a	/		ufs	rw	1	1
+/dev/ada0s2a	/		ufs	rw	1	1
 EOF
     make_esp ${src} ${img}.s1
     makefs -t ffs -B little -s 200m ${img}.s2a ${src}