From owner-svn-src-all@freebsd.org  Thu Feb 11 02:02:02 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 61B82AA0FCC;
 Thu, 11 Feb 2016 02:02:02 +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 333DF25A;
 Thu, 11 Feb 2016 02:02:02 +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 u1B2213r078896;
 Thu, 11 Feb 2016 02:02:01 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1B221Cw078895;
 Thu, 11 Feb 2016 02:02:01 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201602110202.u1B221Cw078895@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: Thu, 11 Feb 2016 02:02:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295497 - head/share/man/man8
X-SVN-Group: head
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.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2016 02:02:02 -0000

Author: emaste
Date: Thu Feb 11 02:02:01 2016
New Revision: 295497
URL: https://svnweb.freebsd.org/changeset/base/295497

Log:
  Update uefi.8 for ZFS and multi device boot support
  
  As of r294068 boot1.efi can load loader.efi from ZFS.
  
  As of r295320 boot1.efi prefers to load loader.efi from the same device
  it was loaded from.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/man/man8/uefi.8

Modified: head/share/man/man8/uefi.8
==============================================================================
--- head/share/man/man8/uefi.8	Thu Feb 11 01:30:43 2016	(r295496)
+++ head/share/man/man8/uefi.8	Thu Feb 11 02:02:01 2016	(r295497)
@@ -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.