From nobody Fri May 27 15:09:55 2022 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 6D4691B3FC7B; Fri, 27 May 2022 15:09:55 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8pBW2f78z3hwG; Fri, 27 May 2022 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653664195; 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=Uqmvat9VrfnVpijcA2Ak4ySHCUbyk4CGYSi8vX5FQXM=; b=Hubjl7EWOr6I70Xl+CBVp/vV6a1J+MyL2aD865Rif4qiMBBpxBJNMIDt57MOaWB8xxRiaB BlRMRWl5yIGbT6jNqSnAlLzMmF+afNwplVaIkZMu9PAauQwrtTHPBh6pgSW+b/w8bVWWY3 ik/I1OW9IcY3LfVQ/9wlpTdWLiH/wvpQEzq859sTRdSdmEU2VFLfiaGfHioASn1w5YWfJy z7WVOJyzOhtanjBlJpT8ptw4i+dT+GcLmxsMdQXwq3LdBRaYKyRi9g8vz4uTDhcqjk0yGC 9aHyuWqLeI69m0J/3SOn+130AlDP3OiZrSr47qTs6dr2jmC49c+wc/uRVtiBqQ== 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 373B02490C; Fri, 27 May 2022 15:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24RF9tfv088456; Fri, 27 May 2022 15:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RF9t7g088455; Fri, 27 May 2022 15:09:55 GMT (envelope-from git) Date: Fri, 27 May 2022 15:09:55 GMT Message-Id: <202205271509.24RF9t7g088455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: caf73e585793 - main - bsdinstall: fix prepopulating the ZFS disk menu with ZFSBOOT_DISKS 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caf73e58579343fc1661f43554b30115bb940535 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653664195; 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=Uqmvat9VrfnVpijcA2Ak4ySHCUbyk4CGYSi8vX5FQXM=; b=qozo53kDcJfaJNyG0woc1Lhj0Agf2D67q85/9AcWcBtNk9WeQhW0+/hORPYdlnHbf1PIA2 yuK7WaMM/IQpXaawHPfXWIM/5iYUzvTcr5xo6OdtZiQZ+3uNaO5+vHL6L5WzayHBOhoLkj QPbc+pEeWcmGc3Kc5e3ScHuirMpzU5nEZ0ckVwcuDyEL+FeJQsKL6FU22qSYTOql/GEQOj jBVpjcrwEFhtG/uay6aPbblYdEYhS00Xy1ifRV7JCTDlVloi5Gonv8PI16PSG8CBN8zucs S0kHKJsX+ZYdywl2ljGgGNyN44iRoSRbSqrEDmeyfRLQ23GmQNwzYl0xiXzw/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653664195; a=rsa-sha256; cv=none; b=RaziUky/lpFFnA1LqNpYW4eX/oJYpmsyVdvrWW5LTCq+IbYbhQ6tTZCxI/fdSP4WqzVO9F claOecbHU/Vl4MgRAVIKLsSGeJsNxbAx+WIX+aeP2VsZke3C8Pj/VSsxCkmI8j7HJM8K81 ozV70Dn/52qwJXY7q6q670Fj1rlBreTEM920ti/r0keNZBX+LL74eyChet/Z/7JkfFCvKH qW3AgcID3CNhbSCTbQ8DxpxNsTrUSRz9qNEU+aZ+noXjopJdtbEYGVQG3q/uL873DC3BXK zY+Ao/CuadBuvEuo+57PmeSsPji9/qfSxbalPhaoLktp4v1/hF1B8zv297r6Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=caf73e58579343fc1661f43554b30115bb940535 commit caf73e58579343fc1661f43554b30115bb940535 Author: Alan Somers AuthorDate: 2022-05-26 22:20:03 +0000 Commit: Alan Somers CommitDate: 2022-05-27 15:09:33 +0000 bsdinstall: fix prepopulating the ZFS disk menu with ZFSBOOT_DISKS If the ZFSBOOT_DISKS variable is set to one or more disk names, then those disks should be preselected in the disk menu. However, the code wasn't correctly setting the variable, leaving all disks unselected. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: dteske Differential Revision: https://reviews.freebsd.org/D35331 --- usr.sbin/bsdinstall/scripts/zfsboot | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index a98cf4a33f28..40973f737761 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -659,7 +659,7 @@ dialog_menu_layout() while :; do # Loop over list of available disks, resetting state for disk in $disks; do - f_isset _${disk}_status && _${disk}_status= + f_isset _${disk}_status && setvar _${disk}_status done # Loop over list of selected disks and create temporary @@ -667,9 +667,8 @@ dialog_menu_layout() for disk in $ZFSBOOT_DISKS; do debug= f_device_find -1 \ $disk $DEVICE_TYPE_DISK disk - f_isset _${disk}_status || - local _${disk}_status - _${disk}_status=on + local _${disk}_status + setvar _${disk}_status on done # Create the checklist menu of discovered disk devices