From nobody Mon Jul 28 14:58:14 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4brM6Z57bgz639SY; Mon, 28 Jul 2025 14:58:14 +0000 (UTC) (envelope-from git@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4brM6Z4Fg8z3MDC; Mon, 28 Jul 2025 14:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753714694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsVMih6fwQzbiP6krjr7RTlLb8IPELboVvwjvwu3FYA=; b=QAR4UzOZFqy40ZTrBA6MGVu6YAR/CDqvpLepDHXTrpHYTl6NoLkHu6k5vvWzTittqErhmK N4cK/I417lqYHl2rH1g13tyVRyC6CSRVKDEmqBKWrw++jKPmkqYsW9ev/eEZxlHZccUaz0 PRE7L3WHm6HNjcDkB/NpAb+7s2TDBmVnIc69XmeZXbd+JKLXrVK6/GRkDtStH2XSj6YEdX OdrQF3AyAt2sJD53xj3L8dFpNsD3SS29r7xD37UTPZLYy38JuU2Sm0aTxtOguoJCkQYHyS tUb4QMzz8xgySET0foFpKleri1ih4jH5+qRvnqiV/BMzbAaHieg0kiT1cA9NFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753714694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsVMih6fwQzbiP6krjr7RTlLb8IPELboVvwjvwu3FYA=; b=FctEvuSbsaP+MOWdY/yxAPndGozpWSsUjOnefkYmWYjn7oknFy228cJUcVFkgDpGNEEgsh oDZzReqI8if4WGDJrMnPBPelqwzIyk94T0acIIhE06ySPG7K6TcQCOt4wtAwz7DDP/kJtz Vs0tq55lNIhNCw8aohfSTKYFjZ2GEcKxYy+vkolG+KyLuCR3Mdylqow9yJHxh3vVZsdJwi keUsi13wi4ECaLe5FYz1jorjByIOf+YW/1tJ06Bgnu8laFhl07SJZdVPNzXtN2vNTl3oun fqogjWWTNspESvJZcG4dvn01nEDmhpCHmkXODPdvr1n8ElFYHcdddIZvu20Scg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753714694; a=rsa-sha256; cv=none; b=gkRtXtxPGVBn3+17CvJwZoflZk6BhQ06+y77uxTeKIiioZdfvpf4FWt6l9dta9uImCjh1i ljrKvTH+P9ZU9p1ZBZt4kahPZWBO4V+q2pPoc8bYG3slnySg29ujtfeJ0tT1H/M4xvU5YH 3MevyPSOBbkkzViWHdHj7FdVqFNW8b9/IVpH1tOBrcdGQHENseLBVrGaapLkM0kO0m3vRS hrm1yWNbncYLOXOVVUo4lfwMdN9tumS0b3Dg7fECcDACivJjstZzb5do0H7/55qoraBSe8 Os+NLRjSqfeXP/FnEvq1tHOz6BQSvwVvMubV/vrdXuUDjYkFXBUMKasznFByPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4brM6Z39FFzqF0; Mon, 28 Jul 2025 14:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56SEwE8q039880; Mon, 28 Jul 2025 14:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SEwEv1039877; Mon, 28 Jul 2025 14:58:14 GMT (envelope-from git) Date: Mon, 28 Jul 2025 14:58:14 GMT Message-Id: <202507281458.56SEwEv1039877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e958bc1c1337 - main - tools/boot/rootgen: Remove stray zfsboot1 from ZFS + MBR + UEFI function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e958bc1c13377767d9b2cf87d072d923aa3d482a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e958bc1c13377767d9b2cf87d072d923aa3d482a commit e958bc1c13377767d9b2cf87d072d923aa3d482a Author: John Baldwin AuthorDate: 2025-07-28 14:55:07 +0000 Commit: John Baldwin CommitDate: 2025-07-28 14:58:02 +0000 tools/boot/rootgen: Remove stray zfsboot1 from ZFS + MBR + UEFI function This was copy-pasted from the ZFS + MBF + BIOS function, but without the corresponding code to extract zfsboot1 from /boot/zfsboot via dd(1). It's also not necessary since UEFI booting doesn't make use of BSD label boot blocks (note the lack of any -b option to mkimg when generating the BSD partition in mk_nogeli_mbr_ufs_uefi()). Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D51544 --- tools/boot/rootgen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index d87eb481e2c1..32007a46802e 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -244,7 +244,7 @@ mk_nogeli_mbr_zfs_uefi() { makefs -t zfs -s 200m \ -o poolname=${pool} -o bootfs=${pool} -o rootpath=/ \ ${img}.s2a ${src} ${dst} - mkimg -s bsd -b ${dst}zfsboot1 -p freebsd-zfs:=${img}.s2a -o ${img}.s2 + mkimg -s bsd -p freebsd-zfs:=${img}.s2a -o ${img}.s2 mkimg -a 1 -s mbr -b ${src}/boot/mbr -p efi:=${img}.s1 -p freebsd:=${img}.s2 -o ${img} rm -rf ${dst} }