From nobody Wed Jun 10 12:36:03 2026 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 4gb4yD4KXJz6g3yb for ; Wed, 10 Jun 2026 12:36:04 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gb4yD1gJjz43GQ for ; Wed, 10 Jun 2026 12:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781094964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIoIFyTrq64Ey+Xdaf7l8KwrlXUL9Oow8hP3VcA4lAk=; b=KpqJKlS7wX3t5XLQ6b7NLGhr0ARX9FtTAiKFVL0CtL9yl6PEJtvWFkWDcwSqgn6zf1ybss vLyIT8HemgURFdwDTY9C5a2MyOl/ht73t3CEDmiKsBdeKB3gBbVfuMWML4h47AI1PYcO+d ZC8S/0Q9lL2tZUfrP98mY5qRlTSenXy5G4SmSgKxstb3BZAsomGCkJuZ8DbP7spe3XukRY 2qyJGuNGyApRo6Ur3YXY91OeIZIQpjsbuyajeVWLI8UypW4IV0vOwrQwixJoV+XDEouv4t WhmIidygPHhnUip0Ca8vMH1H/dL2XY5ePhHnOw8AnlDqyGM8Jd0I3juEq6BCeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781094964; a=rsa-sha256; cv=none; b=mo5EUDpjnhYSyj37uiJw0JYj2Co7WO7Uv+K13kUiA1QocuO8XSjNN5NfXEvmFcFHItqf3x ozXMwUVw3F3wqfK+Y/1DzVBlByxfxQIo/0rzz8A7PZV7zZNOHzqnbi2z+zZ6r//heyn3BL 3DiBBwTuxMyASIRFrjkyTxFvA7bs9QMU8sI+d6099lY2F3KpUWEbf2HjDP14LGpMc2jvLh hG2Qo3WfuSctEYP1yDxPxdHdxSnf+s17TgDFovtuLe+2mAy2uwj1hoaNgx+yDQt5XSLgfl 5SQv/ElGaVgDUI6r/4PjeWbvPEbkZudvCK2sxTjnNTg8CvEW2u4Ye9VcJLIPhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781094964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIoIFyTrq64Ey+Xdaf7l8KwrlXUL9Oow8hP3VcA4lAk=; b=K8KeVGKfs8krOIJtB6YzQsJCrwmWptCDekUziXSX3GA2i9NOSqMYqqaSp4Av1lb0IOJFPY eCW9f8fi7Ky40Rg2YIHhSweo0+5X8BX1iQ83BwwE/X6kDhsc+s/jN9DZ0xxmaSqKxZi9Tu DrcdSea07K1n2VyY+tQUHrDm/e5bx1b2ioT3mcw1WyI2IaNsYapGQ/1E9GTQHgGZTGWdQP NQtyClCATYOlgpsSaH88Uic48h9DZ2EuF9bqV4WOKKFOA+igbTHqJrcH+TuTkt2g06Xikc 8R3l8A3jNfaoqKT4yzaHx7VIY9otFphtukb3Xt7c+6G6BIByTsm3p30TGsOrhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gb4yD020cz1KXk for ; Wed, 10 Jun 2026 12:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c5e2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 10 Jun 2026 12:36:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Phil Krylov From: Warner Losh Subject: git: a62eaf71ddb7 - main - bsdinstall(8): Fix GPT label conflicts with disks not managed by us 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a62eaf71ddb7463cf51d2be8be6506befbcfff8d Auto-Submitted: auto-generated Date: Wed, 10 Jun 2026 12:36:03 +0000 Message-Id: <6a295a33.3c5e2.4e095571@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a62eaf71ddb7463cf51d2be8be6506befbcfff8d commit a62eaf71ddb7463cf51d2be8be6506befbcfff8d Author: Phil Krylov AuthorDate: 2025-06-22 02:39:30 +0000 Commit: Warner Losh CommitDate: 2026-06-10 12:35:02 +0000 bsdinstall(8): Fix GPT label conflicts with disks not managed by us Signed-off-by: Phil Krylov Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1735 --- usr.sbin/bsdinstall/scripts/zfsboot | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index a973b03d17fd..dbf7e19c6f5b 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -242,6 +242,7 @@ ZPOOL_SET='zpool set %s "%s"' hline_alnum_arrows_punc_tab_enter="Use alnum, arrows, punctuation, TAB or ENTER" hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER" hline_arrows_tab_enter="Press arrows, TAB or ENTER" +msg_all_possible_gpt_labels_already_taken="All possible GPT labels already taken" msg_an_unknown_error_occurred="An unknown error occurred" msg_back="Back" msg_cancel="Cancel" @@ -840,6 +841,24 @@ zfs_create_diskpart() case "$ZFSBOOT_PARTITION_SCHEME" in ""|GPT*) f_dprintf "$funcname: Creating GPT layout..." + # + # 0. Check for potential GPT label conflicts with disks not + # managed by us and adjust $index accordingly + # + while [ -e /dev/gpt/efiboot$index ] || + [ -e /dev/gpt/gptboot$index ] || + [ -e /dev/gpt/boot$index ] || + [ -e /dev/gpt/swap$index ] || + [ -e /dev/gpt/zfs$index ]; do + index=$(( $index + 1 )) + if [ $index -ge 4096 ]; then + f_dprintf "$funcname: all possible GPT labels already taken" + msg_error="$msg_error: $funcname" f_show_err \ + "$msg_all_possible_gpt_labels_already_taken" + return $FAILURE + fi + done + # # 1. Create GPT layout using labels #