From nobody Fri Jan 24 19:40:01 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 4Yfp752cnDz5lptB; Fri, 24 Jan 2025 19:40:01 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yfp751sLyz3QfK; Fri, 24 Jan 2025 19:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737747601; 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=C/IPUH1d/k478gRKAZq9LcX4RmKzDYqEIBwifyh0uVI=; b=kiz3WWpT4XNPvstAdVspyMp+8us1JXAabzl6u238HZXiZisPQLvYpHyJkt/4dcVEpO8kth 0NMEP2SOt6VCwp+D5SxTdxY60HLmP3QzMfTvdvvm6EfToj5Yqrd239dh/WWy7r000bZQvY VtcNxnIjNjSrRXuUS6gr2jtD3HGuiVq0unlK/SpUTBIz+E2raf26RTgjcvj3MxHSuC3fqM M96b+WVcO+ZrOrHgzII4795XwltJW+0iDvnsd08HI6heafGXncqF1YSq30PwlUogq00jpC 6MHYigbi1RZvFCCZHdmvbk2zgSntxdxJZUH05LqvSnpryBWABtp0MFTl4b2sFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737747601; 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=C/IPUH1d/k478gRKAZq9LcX4RmKzDYqEIBwifyh0uVI=; b=wRbSt5JEE6ZfOTkZGTaJFPIE7CQJsUJ0HkU6GFQnhpfxzV68uXU6jXetGLn9Vh93NB8DS5 xDC+6bp+Sj9NFegHsWBNkrG+K9+mDVh50gassG9qWkckx1KQUk6PgX0mwIf8raADbtKBaG A/fj5uJzJ/JbfQyyH8gn5X1IQghM7SyHwBGBj5dD72sAVrQwYZs5kBLiATyuB6lWRqWwvo PWP/wYIrJbLtCUbWezfxA0SRscMPkFWXdfOwblxVzUr40zRmNFNerPFCTtDRQC49T28YGn u2IZ7rJzNbkAbJwoOrnV6wjdDJwBBY2a+QP+BFVQZGXxORLWQTXMMMESeuCdqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737747601; a=rsa-sha256; cv=none; b=l6CRwuTj8uoYhjo8/1z8Vw0pA7B5nScZXhklpxYB+fo6OvkHgyLRXeumQg+vxAmOMRa6dM BL0+pXX52sgzU2n0qadb2l5PNUL7fc6cUQ70ojq5iY3+u1W0S7b6EJ9Ohp05OAGrvwK2Mn yjbQWgzYCn3BXt3tLHf6LojqdzqtN8+FlvGuwEe/6L4ql0DPn57a4Uv8dlM0+tzCGH2Zu2 F69xlbW29SEnt4SEzEIR+8FWFFoN0tiqa0nS1Wa9YI4w3Dlte26XgHB+CGm7Qn2OhgkaHK kw8v7zD2XRyxVq/C+1FQ79ln3MM/Ra8A4WSMEoFj839/+5koHUCeFEyjbsrWPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Yfp7518xKzgH3; Fri, 24 Jan 2025 19:40:01 +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 50OJe1dL070893; Fri, 24 Jan 2025 19:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OJe1bh070890; Fri, 24 Jan 2025 19:40:01 GMT (envelope-from git) Date: Fri, 24 Jan 2025 19:40:01 GMT Message-Id: <202501241940.50OJe1bh070890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d726bc286325 - main - bsdinstall: hook up help line and prompt for ZFS disk selection 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d726bc286325dd7093b83c6ebcbaa768c687d825 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d726bc286325dd7093b83c6ebcbaa768c687d825 commit d726bc286325dd7093b83c6ebcbaa768c687d825 Author: Franco Fichtner AuthorDate: 2025-01-23 11:27:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-24 19:33:18 +0000 bsdinstall: hook up help line and prompt for ZFS disk selection Previously we were passing the wrong variable names for the prompt and help line, so the intended action wasn't clear to the user. Reviewed by: jhb, markj MFC after: 3 days See also: https://github.com/opnsense/installer/issues/22 Pull Request: https://github.com/freebsd/freebsd-src/pull/1579 --- usr.sbin/bsdinstall/scripts/zfsboot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index bfb863f5e7c8..f4670e0d272c 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -688,17 +688,17 @@ dialog_menu_layout() done eval f_dialog_checklist_size height width rows \ - \"\$title\" \"\$btitle\" \"\$prompt\" \ - \"\$hline\" $disk_check_list + \"\$title\" \"\$btitle\" \"\$disk_prompt\" \ + \"\$disk_hline\" $disk_check_list selections=$( eval $DIALOG \ --title \"\$DIALOG_TITLE\" \ --backtitle \"\$DIALOG_BACKTITLE\" \ --separate-output \ - --hline \"\$hline\" \ + --hline \"\$disk_hline\" \ --ok-label \"\$msg_ok\" \ --cancel-label \"\$msg_back\" \ - --checklist \"\$prompt\" \ + --checklist \"\$disk_prompt\" \ $height $width $rows \ $disk_check_list \ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD