From owner-svn-src-all@freebsd.org Fri Jul 20 05:26:16 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F169103141E; Fri, 20 Jul 2018 05:26:16 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0C9328D980; Fri, 20 Jul 2018 05:26:16 +0000 (UTC) (envelope-from imp@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE0C03E69; Fri, 20 Jul 2018 05:26:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6K5QFUD023023; Fri, 20 Jul 2018 05:26:15 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6K5QF06023020; Fri, 20 Jul 2018 05:26:15 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201807200526.w6K5QF06023020@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 20 Jul 2018 05:26:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336536 - in head: lib/geom/part tools/build/options tools/tools/zfsboottest X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: lib/geom/part tools/build/options tools/tools/zfsboottest X-SVN-Commit-Revision: 336536 X-SVN-Commit-Repository: base 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.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 05:26:16 -0000 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,