From owner-svn-src-all@freebsd.org Sat Oct 31 03:36:32 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A2044672B8; Sat, 31 Oct 2020 03:36:32 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CNPww2DmBz3fhv; Sat, 31 Oct 2020 03:36:32 +0000 (UTC) (envelope-from cperciva@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 2D28D2154E; Sat, 31 Oct 2020 03:36:32 +0000 (UTC) (envelope-from cperciva@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09V3aWRo060299; Sat, 31 Oct 2020 03:36:32 GMT (envelope-from cperciva@FreeBSD.org) Received: (from cperciva@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09V3aWSl060298; Sat, 31 Oct 2020 03:36:32 GMT (envelope-from cperciva@FreeBSD.org) Message-Id: <202010310336.09V3aWSl060298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cperciva set sender to cperciva@FreeBSD.org using -f From: Colin Percival Date: Sat, 31 Oct 2020 03:36:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367195 - head X-SVN-Group: head X-SVN-Commit-Author: cperciva X-SVN-Commit-Paths: head X-SVN-Commit-Revision: 367195 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.33 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: Sat, 31 Oct 2020 03:36:32 -0000 Author: cperciva Date: Sat Oct 31 03:36:31 2020 New Revision: 367195 URL: https://svnweb.freebsd.org/changeset/base/367195 Log: Attempt to defuse a land mine before anyone else steps on it: The freebsd-boot partition is not always the first one. Following the instructions in UPDATING resulted in my overwriting the efiboot0 partition on my laptop with ZFS boot blocks, which had negative effects on the system's bootability. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D27002 Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Sat Oct 31 02:57:53 2020 (r367194) +++ head/UPDATING Sat Oct 31 03:36:31 2020 (r367195) @@ -2203,9 +2203,11 @@ COMMON ITEMS: 2.) update the ZFS boot block on your boot drive - The following example updates the ZFS boot block on the first - partition (freebsd-boot) of a GPT partitioned drive ada0: - "gpart bootcode -p /boot/gptzfsboot -i 1 ada0" + The following example updates the ZFS boot block on the + freebsd-boot partition of a GPT partitioned drive ada0: + "gpart bootcode -p /boot/gptzfsboot -i $N ada0" + The value $N will typically be 1 (if booting from BIOS) or 2 (if + booting from EFI). Non-boot pools do not need these updates.