From owner-svn-src-stable-10@freebsd.org  Tue Feb 16 03:50:58 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 55CE6AA8720;
 Tue, 16 Feb 2016 03:50:58 +0000 (UTC)
 (envelope-from emaste@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 mx1.freebsd.org (Postfix) with ESMTPS id 232FAFE3;
 Tue, 16 Feb 2016 03:50:58 +0000 (UTC)
 (envelope-from emaste@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1G3ovKb038967;
 Tue, 16 Feb 2016 03:50:57 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1G3ov8U038966;
 Tue, 16 Feb 2016 03:50:57 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201602160350.u1G3ov8U038966@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 16 Feb 2016 03:50:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r295652 - stable/10/share/man/man8
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 16 Feb 2016 03:50:58 -0000

Author: emaste
Date: Tue Feb 16 03:50:56 2016
New Revision: 295652
URL: https://svnweb.freebsd.org/changeset/base/295652

Log:
  MFC r295497: Update uefi.8 for ZFS and multi device boot support
  
  Approved by:	re (gjb)

Modified:
  stable/10/share/man/man8/uefi.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/man/man8/uefi.8
==============================================================================
--- stable/10/share/man/man8/uefi.8	Tue Feb 16 02:23:39 2016	(r295651)
+++ stable/10/share/man/man8/uefi.8	Tue Feb 16 03:50:56 2016	(r295652)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 14, 2016
+.Dd February 15, 2016
 .Dt UEFI 8
 .Os
 .Sh NAME
@@ -83,9 +83,17 @@ passes the configuration to the next sta
 itself act on the contents of the file.
 .It
 .Pa boot1.efi
-locates the first partition with the type
-.Li freebsd-ufs ,
-and from it loads
+searches partitions of type
+.Li freebsd-ufs
+and
+.Li freebsd-zfs
+for
+.Pa loader.efi .
+The search begins with partitions on the device from which
+.Pa boot1.efi
+was loaded, and continues with other available partitions.
+.Pa boot1.efi
+then loads and executes
 .Pa loader.efi .
 .It
 .Pa loader.efi
@@ -146,19 +154,3 @@ Foundation sponsored portions of the wor
 EFI environment variables are not supported by
 .Xr loader 8
 or the kernel.
-.Pp
-.Pa boot1.efi
-loads
-.Pa loader.efi
-from the first FreeBSD-UFS file system it locates, even if it is on a
-different disk.
-.Pp
-.Pa boot1.efi
-cannot load
-.Pa loader.efi
-from a
-.Xr ZFS 8
-file system.
-As a result,
-.Nm
-does not support a typical root file system on ZFS configuration.