From nobody Sun Jul 24 15:40:41 2022 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 4LrS7G0XK2z4Wrj6; Sun, 24 Jul 2022 15:40:42 +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 4LrS7G03l9z474N; Sun, 24 Jul 2022 15:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677242; 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=ldgyzb6fflj8y43qklFPrNq7QA/vhZFn1vuJrjSecMw=; b=to7Gk4Ab4MbLb0Rel0VOo9Gtr8IbMPC3QnM7JTPFOzinW+8eXCLLW2uNLeAIibjpejltSO SmvXlPYMxY5uXpQiuemxZyxi/C9AFtm0yD33mdk9XES5bx2QquTuzbpf1NnIs8yfk5YMKy UkmWkh7pRz1WVCZPiCTeALJ1sNBY9et9NUzU/1FwotEIIoIJ1eojHh7n/d7Ckr5yWDye8z onQz3G7MprHdu6XV7+j/dVZ+00ZhBvZ14wq6VKro4RTxPFDdWx678xsj9ESYPNwIywT9j5 GD9woAhwQiDQiYxk7aQodnnKFBV3yuezooyEyVpNbDCFxp97WXmjf9Q1GME2Dg== 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 4LrS7F668vzNXG; Sun, 24 Jul 2022 15:40:41 +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 26OFef8v017675; Sun, 24 Jul 2022 15:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26OFefJS017663; Sun, 24 Jul 2022 15:40:41 GMT (envelope-from git) Date: Sun, 24 Jul 2022 15:40:41 GMT Message-Id: <202207241540.26OFefJS017663@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 7b9dcf526392 - stable/13 - bsdinstall: fix prepopulating the ZFS disk menu with ZFSBOOT_DISKS 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 7b9dcf52639271931dadbc2c137ff0b9dc8ccb34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658677242; 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=ldgyzb6fflj8y43qklFPrNq7QA/vhZFn1vuJrjSecMw=; b=vcCLrObxEH5Kmf+zbF3WZV2C+m3i8O045Xe4YwvH8gzVU1aYBRspStXCaqSrCpvdJmHNe2 z/elAZ6JdFELMRRI0BT74r0RidGaVv/uwW/TKmSiYMiFg7iEe3dSdUQtiuLxhGCgspBUuo ylYajLAZCptCODPIufhvIzGpMeloiP94HN/tXxR61mbBxpotUiylg4HPekAvKiZbbDfNND gOG2cXz6YMyUMLtiPdNMxowvLv2no5qluqzK8TkJ7jy7ylWUfdMDmsNrxbAHvr6nyXTplF v4MJrtrj/xc2Ql8GkbGkSUbqxmaB5vQVVK18TKBYppWGmckHDZAOrD1k5mWlSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658677242; a=rsa-sha256; cv=none; b=B7wdaMVwJDsTr1bb6iDopLMZUuJwPDd6QWbKIQPilJuR6YQRo1MV7b23Ot4pCT3MI7UMR+ KiXwl0f/oBHM6CxW/voW1sXEYR4SdyyyGoNS04cO11IGw5PZy0M5l5va57t9GLvXzcWxTr CVdRAoDjhkdt1dH5fU61/4G5RDzF1Ikw7TADu8mpedzOcO24kYpsf3tu9fAA1wH37EFjY/ nt8e93yxQJSO5NKAnGJL1gN5vnYsj2Q8qt6u0L+q+zSOr1aJ+tFOig4OfbvzdUVcG6eVyL kqX7gf5Y/EzUh/IHIREkpRH13KT9AYiCk8UoQ4kUDkPzss2LDTKUs3rnlGj2ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=7b9dcf52639271931dadbc2c137ff0b9dc8ccb34 commit 7b9dcf52639271931dadbc2c137ff0b9dc8ccb34 Author: Alan Somers AuthorDate: 2022-05-26 22:20:03 +0000 Commit: Alan Somers CommitDate: 2022-07-24 15:39:44 +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 (cherry picked from commit caf73e58579343fc1661f43554b30115bb940535) Fix a memory leak from caf73e58579 Don't shadow an already-local variable with another local declaration. Reported by: dteske MFC after: 13 days MFC with: caf73e58579343fc1661f43554b30115bb940535 Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D35331 (cherry picked from commit 77d678b7a4075a056be621b46be50377f08bfc9e) --- usr.sbin/bsdinstall/scripts/zfsboot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 14fbdd0d67fb..9a15bd719f5a 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -644,7 +644,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 @@ -654,7 +654,7 @@ dialog_menu_layout() $disk $DEVICE_TYPE_DISK disk f_isset _${disk}_status || local _${disk}_status - _${disk}_status=on + setvar _${disk}_status on done # Create the checklist menu of discovered disk devices