Date: Fri, 20 Jul 2018 05:17:50 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336533 - in head/stand: i386/gptzfsboot i386/zfsboot lua man Message-ID: <201807200517.w6K5Ho9i017860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Fri Jul 20 05:17:49 2018 New Revision: 336533 URL: https://svnweb.freebsd.org/changeset/base/336533 Log: Eliminate zfsloader man page. Remove all cross references to zfsloader.8 and /boot/zfsloader. Move ZFS specific info into loader.8. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D16361 Deleted: head/stand/man/zfsloader.8 Modified: head/stand/i386/gptzfsboot/gptzfsboot.8 head/stand/i386/zfsboot/zfsboot.8 head/stand/lua/core.lua.8 head/stand/man/Makefile head/stand/man/loader.8 Modified: head/stand/i386/gptzfsboot/gptzfsboot.8 ============================================================================== --- head/stand/i386/gptzfsboot/gptzfsboot.8 Fri Jul 20 05:17:37 2018 (r336532) +++ head/stand/i386/gptzfsboot/gptzfsboot.8 Fri Jul 20 05:17:49 2018 (r336533) @@ -71,7 +71,7 @@ If the .Cm bootfs property is not set, then the root filesystem of the pool is used as the default. -.Xr zfsloader 8 +.Xr loader 8 is loaded from the boot filesystem. If .Pa /boot.config @@ -83,7 +83,7 @@ in the same way as .Pp The ZFS GUIDs of the first successfully probed device and the first detected pool are made available to -.Xr zfsloader 8 +.Xr loader 8 in the .Cm vfs.zfs.boot.primary_vdev and @@ -104,7 +104,7 @@ accepts all the options that supports. .Pp The filesystem specification and the path to -.Xr zfsloader 8 +.Xr loader 8 are different from .Xr boot 8 . The format is @@ -116,7 +116,7 @@ The format is Both the filesystem and the path can be specified. If only a path is specified, then the default filesystem is used. If only a pool and filesystem are specified, then -.Pa /boot/zfsloader +.Pa /boot/loader is used as a path. .Pp Additionally, the @@ -128,7 +128,7 @@ The output format is similar to that of .Pp The configured or automatically determined ZFS boot filesystem is stored in the -.Xr zfsloader 8 +.Xr loader 8 .Cm loaddev variable, and also set as the initial value of the .Cm currdev @@ -171,7 +171,6 @@ gpart bootcode -p /boot/gptzfsboot -i 1 ada0 .Xr boot 8 , .Xr gpart 8 , .Xr loader 8 , -.Xr zfsloader 8 , .Xr zpool 8 .Sh HISTORY .Nm Modified: head/stand/i386/zfsboot/zfsboot.8 ============================================================================== --- head/stand/i386/zfsboot/zfsboot.8 Fri Jul 20 05:17:37 2018 (r336532) +++ head/stand/i386/zfsboot/zfsboot.8 Fri Jul 20 05:17:49 2018 (r336533) @@ -114,7 +114,6 @@ in the example above. .Xr boot 8 , .Xr gptzfsboot 8 , .Xr loader 8 , -.Xr zfsloader 8 , .Xr zpool 8 .Sh HISTORY .Nm Modified: head/stand/lua/core.lua.8 ============================================================================== --- head/stand/lua/core.lua.8 Fri Jul 20 05:17:37 2018 (r336532) +++ head/stand/lua/core.lua.8 Fri Jul 20 05:17:49 2018 (r336533) @@ -169,7 +169,7 @@ These will be picked up using the and .Ev bootenvs_count variables set by -.Xr zfsloader 8 . +.Xr loader 8 . .It Fn core.setDefaults Resets ACPI, safe mode, single user, and verbose settings to their system defauilts. Modified: head/stand/man/Makefile ============================================================================== --- head/stand/man/Makefile Fri Jul 20 05:17:37 2018 (r336532) +++ head/stand/man/Makefile Fri Jul 20 05:17:49 2018 (r336533) @@ -3,8 +3,5 @@ .include <bsd.init.mk> MAN+= loader.8 -.if ${MK_ZFS} != "no" -MAN+= zfsloader.8 -.endif .include <bsd.prog.mk> Modified: head/stand/man/loader.8 ============================================================================== --- head/stand/man/loader.8 Fri Jul 20 05:17:37 2018 (r336532) +++ head/stand/man/loader.8 Fri Jul 20 05:17:49 2018 (r336533) @@ -1038,6 +1038,52 @@ executed. .It -259 Unspecified error. .El +.Sh ZFS FEATURES +.Nm +supports the following format for specifying ZFS filesystems which +can be used wherever +.Xr loader 8 +refers to a device specification: +.Pp +.Ar zfs:pool/filesystem: +.Pp +where +.Pa pool/filesystem +is a ZFS filesystem name as described in +.Xr zfs 8 . +.Pp +If +.Pa /etc/fstab +does not have an entry for the root filesystem and +.Va vfs.root.mountfrom +is not set, but +.Va currdev +refers to a ZFS filesystem, then +.Nm +will instruct kernel to use that filesystem as the root filesystem. +.Sh ZFS COMMAND EXTENSIONS +.Bl -tag -width Ds -compact +.It Ic lsdev Op Fl v +Lists ZFS pools in addition to disks and partitions. +Adding +.Fl v +shows more ZFS pool details in a format that resembles +.Nm zpool Cm status +output. +.Pp +.It Ic lszfs Ar filesystem +A ZFS extended command that can be used to explore the ZFS filesystem +hierarchy in a pool. +Lists the immediate children of the +.Ar filesystem . +The filesystem hierarchy is rooted at a filesystem with the same name +as the pool. +.El +.Sh EXAMPLES +Set the default device used for loading a kernel from a ZFS filesystem: +.Bd -literal -offset indent +set currdev=zfs:tank/ROOT/knowngood: +.Ed .Sh SEE ALSO .Xr libstand 3 , .Xr loader.conf 5 ,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807200517.w6K5Ho9i017860>