diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-07-20 05:26:14 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-07-20 05:26:14 +0000 |
| commit | fe5e6b2c56d355d91314c919daaa12ed825a1527 (patch) | |
| tree | ed3321bcda869e0898b36187579b29c9ea6c84fa | |
| parent | 1f9bd5f67c011e55ac64b22ae4dbeee716ae376c (diff) | |
| download | src-fe5e6b2c56d355d91314c919daaa12ed825a1527.tar.gz src-fe5e6b2c56d355d91314c919daaa12ed825a1527.zip | |
Remove three stray instances of zfsloader.
Notes
Notes:
svn path=/head/; revision=336536
| -rw-r--r-- | lib/geom/part/gpart.8 | 4 | ||||
| -rw-r--r-- | tools/build/options/WITH_LOADER_FIREWIRE | 4 | ||||
| -rw-r--r-- | tools/tools/zfsboottest/zfsboottest.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/geom/part/gpart.8 b/lib/geom/part/gpart.8 index 829181578e8f..76177892ceb1 100644 --- a/lib/geom/part/gpart.8 +++ b/lib/geom/part/gpart.8 @@ -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 diff --git a/tools/build/options/WITH_LOADER_FIREWIRE b/tools/build/options/WITH_LOADER_FIREWIRE index a8f8924934b3..f273654b91c7 100644 --- a/tools/build/options/WITH_LOADER_FIREWIRE +++ b/tools/build/options/WITH_LOADER_FIREWIRE @@ -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. diff --git a/tools/tools/zfsboottest/zfsboottest.c b/tools/tools/zfsboottest/zfsboottest.c index 875657f55b7b..7406ddb77918 100644 --- a/tools/tools/zfsboottest/zfsboottest.c +++ b/tools/tools/zfsboottest/zfsboottest.c @@ -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, |