svn commit: r336536 - in head: lib/geom/part tools/build/options tools/tools/zfsboottest

[Warner Losh]

Author: imp
Date: Fri Jul 20 05:26:14 2018
New Revision: 336536
URL: https://svnweb.freebsd.org/changeset/base/336536

Log:
  Remove three stray instances of zfsloader.

Modified:
  head/lib/geom/part/gpart.8
  head/tools/build/options/WITH_LOADER_FIREWIRE
  head/tools/tools/zfsboottest/zfsboottest.c

Modified: head/lib/geom/part/gpart.8
==============================================================================
--- head/lib/geom/part/gpart.8	Fri Jul 20 05:18:03 2018	(r336535)
+++ head/lib/geom/part/gpart.8	Fri Jul 20 05:26:14 2018	(r336536)
@@ -1086,8 +1086,8 @@ It searches through the GPT for
 .Cm freebsd-zfs
 partitions, trying to detect ZFS pools.
 After all pools are detected,
-.Pa /boot/zfsloader
-is started from the first one found.
+.Pa /boot/loader
+is started from the first one found set as bootable.
 .Pp
 The VTOC8 scheme does not support embedding bootstrap code.
 Instead, the 8 KBytes bootstrap code image

Modified: head/tools/build/options/WITH_LOADER_FIREWIRE
==============================================================================
--- head/tools/build/options/WITH_LOADER_FIREWIRE	Fri Jul 20 05:18:03 2018	(r336535)
+++ head/tools/build/options/WITH_LOADER_FIREWIRE	Fri Jul 20 05:26:14 2018	(r336536)
@@ -1,3 +1,3 @@
 .\" $FreeBSD$
-Enable firewire support in /boot/loader and /boot/zfsloader on x86.
-This option is a nop on all other platforms.
+Enable firewire support in /boot/loader on x86. This option is a nop
+on all other platforms.

Modified: head/tools/tools/zfsboottest/zfsboottest.c
==============================================================================
--- head/tools/tools/zfsboottest/zfsboottest.c	Fri Jul 20 05:18:03 2018	(r336535)
+++ head/tools/tools/zfsboottest/zfsboottest.c	Fri Jul 20 05:26:14 2018	(r336536)
@@ -124,7 +124,7 @@ main(int argc, char** argv)
 			"/dev/gpt/system0",
 			"/dev/gpt/system1",
 			"-",
-			"/boot/zfsloader",
+			"/boot/loader",
 			"/boot/support.4th",
 			"/boot/kernel/kernel",
 			NULL,