From nobody Tue Jan 28 16:00:55 2025 X-Original-To: dev-commits-src-all@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 4Yj94S1JLhz5lfmq; Tue, 28 Jan 2025 16:00:56 +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 4Yj94R4Zdsz3mDh; Tue, 28 Jan 2025 16:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080055; 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=JhuE5nDhjkQqAaipk75pxinxyGFzSJK3tdT6jPQLipQ=; b=TP0F/bVmCbXtZzZrhrsuno35EAstlKUxY4cR2q5/ByZ/W31z1LgSuL8g1QTy3Wn8dnObpB 0cv42l7QnTS91f1JMpsl/VdqNkmYQHzQ6naZd7nb0VefZIi9KOfmX4nkF+PVZXNzTmIo3u x75xcteQhO/G4OGsbMiRMVyZFkmW7houhT5QZpNiVgkVRIuPyIUhp5N3Vp7zA87ueCFAHT rb7zpC2fs2XiwmC6yD97690Q7liZkGez4Xxad9rd0f775DoyOIE7DnQciJqqfVEMrt8/p6 +jn5MBxKyglkLnF7ginbgg0IPPhGy6byHExkvoo1t77fwX2hG1uCGUge1h/2/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738080055; 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=JhuE5nDhjkQqAaipk75pxinxyGFzSJK3tdT6jPQLipQ=; b=WzcENlMIfJqQzhDppIoSO0J7n/Gn1AaFK4Yf06ue5jcteQhCmjxNHCjq+Lb5KUGYrqeyXY yhuD5+ElYa7IoXEgVo8jov0uw2wTns1qMfrbhjkwGd0bls0/E3BSP/un4z/xzGppjHl2q6 NOREUB9BNCKAgHCd73GIEITULHHpPpZzVRlJsm1/FPBcHKo5K+i7dH9rKjBD9dNK8VAdWr uasQ0iwBK0OPju6R6YESocKehoKJhHLJO2wEeElYTSqvN8AmkSRjChN4TZcC2Sl7O4i8Mi FQhFvRSmHwe6mEaQZrJScEbfIuBrqzpX0wJVL1LfWdTnt83QrazEtTDjF/dXVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738080055; a=rsa-sha256; cv=none; b=PkPKGtZnKCEpf920y5l1uec+rgvSGIL3UYTW9hVuS96bi69x+tpyMZQZKPSuNrR+5KcZa6 crPB8TUnnG+GNnSFK5Pv6HSbtrWN1cn0QWT5XZL05UuQXWQsvybLCf/ZIm7G5EIFZdI/Ee BLcwAIBe+r3jqk9+sEFuXu8sIYyPv+Xuxwlx/G9D2UKoPSDvLEHpZQQbm90d6ydzfK4Fu5 441NLAPskWJr1V1eCKwDhQUb+hvPR4ElJydJh8kltLIlU4E8AV5DN/REd55Slg+6tcN+xy a4nq3sARjG84EC6jATWi65GspXU0i3a2t5GCXIVwMUqMepi2xLas0eDqy8Hnxg== 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 4Yj94R31z1z50j; Tue, 28 Jan 2025 16:00:55 +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 50SG0taD038045; Tue, 28 Jan 2025 16:00:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50SG0tc5038042; Tue, 28 Jan 2025 16:00:55 GMT (envelope-from git) Date: Tue, 28 Jan 2025 16:00:55 GMT Message-Id: <202501281600.50SG0tc5038042@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: be53f732663c - stable/14 - bsdinstall: hook up help line and prompt for ZFS disk selection List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: be53f732663cbe9c1c4f3e7310cfa82bbe32da90 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=be53f732663cbe9c1c4f3e7310cfa82bbe32da90 commit be53f732663cbe9c1c4f3e7310cfa82bbe32da90 Author: Franco Fichtner AuthorDate: 2025-01-23 11:27:09 +0000 Commit: Mark Johnston CommitDate: 2025-01-28 16:00:12 +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 (cherry picked from commit d726bc286325dd7093b83c6ebcbaa768c687d825) --- 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 4f3c9719dde0..2b118e33ba36 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -689,17 +689,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