diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-17 11:17:17 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-17 11:17:17 -0200 |
| commit | eea87801dfdf1b51cc56159a1b1eb69109b7c9e7 (patch) | |
| tree | 1792ac0d334dd3ef5cf5459a0a61a5c0c86dccc0 /share | |
| parent | 3882f7f0612f5660c6287cfa1ba025f2843a1957 (diff) | |
| parent | 4aef3019513be35be30d1ea8ff5b072a743f99df (diff) | |
| download | FreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.zip FreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man8/uefi.8 | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 8907ef3..8c1c979 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -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 stage boot loader and does not 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 work. 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. |
