From nobody Tue Nov 29 03:41:51 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 4NLp6m0L6Bz4jmlL; Tue, 29 Nov 2022 03:41:52 +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 4NLp6l5cTnz4Jk5; Tue, 29 Nov 2022 03:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669693311; 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=CspDgsjf2y8MmcveiVW5ORxR6f0MF21CdmUBV720ehM=; b=xyW+5SdgB70wycZJczL7fb2wsxxOrLhFJCVuwIsGjs54LTFlMYHqCFGy1sEF3MXlmgFkIJ JNgMqRCbCvb1b0aHvikbp8zP14QYsjVqxAXbPzPNoI6WEupC6LnfuzFxDwIK03FDvyZ64P n14/0AAxosB1CS3+eT89aqdnPxKzIoO4S7W7yKMhwfYui+/LkBhmfCH92CiElrXAFxVphV MI+Z/fx5za1lRr9f/WhDQbFHwO3AeDK+MGPWMIrs0irKyayvMczCM8kKUsxnfw+54w7nLm KmQ7TkulzPPAw1rj5RpAUGtUZfDyoWs44asriuq5R2HfcMUmz6MAhsb+mEiqDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669693311; 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=CspDgsjf2y8MmcveiVW5ORxR6f0MF21CdmUBV720ehM=; b=HtaVoWf42cd75qR7PgZqgn/SepmmGa9sOJKoIgDEX/6TUturMhKcAs3eQmXFyrMZJlFvvZ gFzXjxDXGjvGPjc5aSIJavXgvGBzqTfTGEDuzHatvCZ2Bs4ZQ57IiJH5S3g+kA4L2t1gyN +XJq5/slqojk2Kb+ruJoFGSp8mM23JiUZUQ+wCZeURzoeJ/zgeahMa2l1DtBCWuzzNLxJR r3e8HLwHRx9fmIORnLa3njn2qfAk9OZok4i603+WEOcTtHtg7nePOsJKEEP7Zlws1fCcoO +zI5Z5xJNyJFc+2t/7N7UMbRt6KJycOHHMgRDodLz8dLS2HM3dd/07WCaRQkog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669693311; a=rsa-sha256; cv=none; b=hdtn6ouqWs1ta+wUpNtTQOpr7Mv5nmmccdU2uQlZQWqr/Y6ndTPA/YyKxUAZ4VdCL6fZuP /WWjvZgR47ZYTLtFTnqRBVfsjC/2hsLpHGe/dZnIKA9ii7I585X0xKlbQcv2TzA5voMT0Z yeJQgoEo4aGQiBwq0jDNnfYCPXcNr1gKOmh1VzMhiW63bdThUhbSlOVe7TaRaWnf9XiX7x yoAzBHBriwiiEFEmFYabRiWxskG1PjLYq15TPsuXhkpb9vp+jpJNB/pv3RKtP5b0SdayCP Q+tTZbPJ4tNzWrmilKXwNTAR5BBzSruMI60ietUr9Pa0p3kh0GcZHzNPTEojGA== 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 4NLp6l4g7Fz13CH; Tue, 29 Nov 2022 03:41:51 +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 2AT3fp5G059209; Tue, 29 Nov 2022 03:41:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AT3fpk8059208; Tue, 29 Nov 2022 03:41:51 GMT (envelope-from git) Date: Tue, 29 Nov 2022 03:41:51 GMT Message-Id: <202211290341.2AT3fpk8059208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: bad602850e56 - main - bsdinstall: Fix local_unbound option default on revisit 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bad602850e56d9e3b4900c0063a40dd29ea448fe Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=bad602850e56d9e3b4900c0063a40dd29ea448fe commit bad602850e56d9e3b4900c0063a40dd29ea448fe Author: Jessica Clarke AuthorDate: 2022-11-29 03:09:51 +0000 Commit: Jessica Clarke CommitDate: 2022-11-29 03:33:47 +0000 bsdinstall: Fix local_unbound option default on revisit The variable used for the checklist's default value needs to correspond to the rc.conf variable as that's what's being parsed to determine them. In the case of local_unbound it's missing the _enable suffix and thus always defaults to off on revisit. Fixes: 58eb9abb3157 ("Add a line to the post-installation configuration dialog to enable the local_unbound service.") --- usr.sbin/bsdinstall/scripts/services | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services index 294e044c74ae..09b6b0734e48 100755 --- a/usr.sbin/bsdinstall/scripts/services +++ b/usr.sbin/bsdinstall/scripts/services @@ -46,7 +46,8 @@ DAEMONS=$( bsddialog --backtitle "$OSNAME Installer" \ --title "System Configuration" --no-cancel --separate-output \ --checklist "Choose the services you would like to be started at boot:" \ 0 0 0 \ - local_unbound "Local caching validating resolver" ${local_unbound:-off} \ + local_unbound "Local caching validating resolver" \ + ${local_unbound_enable:-off} \ sshd "Secure shell daemon" ${sshd_enable:-off} \ moused "PS/2 mouse pointer on console" ${moused_enable:-off} \ ntpd "Synchronize system and network time" ${ntpd_enable:-off} \