From nobody Tue Mar 22 23:59:21 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 2AF7B1A34FBB; Tue, 22 Mar 2022 23:59:22 +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 4KNT3t0fXpz3s41; Tue, 22 Mar 2022 23:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647993562; 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=eSrO64DT6GPTbc8EimjpkSgRXjnyooU5+SOmR5MgS/8=; b=NAbGKRPj9IQDF5kfP28Y/VQQyhJCHERB6WbF5hmJGlngrLLfkh+ESbv58x2Op7fEL75R6Q jV7fWPohDEFlOKWjw4WA1ud7nKEe0c0LmL5AXprmxQKGH27OBj9vEZNhS1t0MpQvJFZy63 McxRYt50V3Xgv6Jhu+thWmMuB0o8Dr8wAmRRkzo8y/8p03a514wIOVoPJEa+fZeytRqsAi sZ7vFip5ZdW3BGK616I/BWfddQ99t3E8vd6RXY/l9EI4l++mnj+PTGf8jepVqcN1IzHdOm Cs9bTaaTZ5FtUFz1AJFK7BN594hAgkT2lh6zfxlDpSSywHMDjU7Nd8+/S6oemg== 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 EAAC9190AB; Tue, 22 Mar 2022 23:59:21 +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 22MNxLjZ005164; Tue, 22 Mar 2022 23:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22MNxLbi005163; Tue, 22 Mar 2022 23:59:21 GMT (envelope-from git) Date: Tue, 22 Mar 2022 23:59:21 GMT Message-Id: <202203222359.22MNxLbi005163@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: 4d1ba6febfa7 - main - bsdinstall hardening: Replace dialog with bsddialog 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: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d1ba6febfa7c7808027fd1ef60b3bffadd17853 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647993562; 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=eSrO64DT6GPTbc8EimjpkSgRXjnyooU5+SOmR5MgS/8=; b=rNBMhwZvYPUW4QUWEPilL6dtGhwVD6W6JxZ4+khl1PqvRLZuYLjK0G5S3qVmPQCUJU1f5n Ij9uvKqRlFjinLGDlo9nSM11kFSwwPkY0m7e9F4YIQola/4Pwg9a0VYREMg2pvfw+pcOqe snER1DZnrmJBTn/zb4NQO6bPc3VYNoor9YWbMM6KViI+13tI9Hw95eHW5ERQ1GT0kZBIpa fsGZaWzOYYyzljHtKyaHTfNGgYXKtHnLiGXFJ/qDxqdpE41RhBsCiVCTLbOSvRGarDXRcn YD8oYeGIfBREcH/yCbfrp7vHVf6tvxorYozt/93l4XRkwFYv75c+JO9Sf56n9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647993562; a=rsa-sha256; cv=none; b=iu3UdFnv4noVCBW8UyvKcvbV2ARD5orBgq28zpsYNRSHO6T2GPqsAoqv/hZP4/F2ePTugK vtFDWqlG0dskP7zhgKm9X15kHcBeZwYtgxL/lsfmKLQc+u91plxqqoMpjWE/S39faSpWjM KAPETlh8BfoRZ0k67oQ2I/2tUUNmzOu09TidaWXhyrBQ2wTAvWsDWVGLV6yG1rtrMSiAbC qzLrWLGWXIg9NQfe66ncCZkVKZsUMV1EKH/g9b19EkaVmjupqykzzmdN9s6qb/yA8YbM5Y DP9hqnwan0in8cAhaIoesgax6GhCjTjSPbSp3Jnnop3rtCY0Wti+xVrkpICikA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=4d1ba6febfa7c7808027fd1ef60b3bffadd17853 commit 4d1ba6febfa7c7808027fd1ef60b3bffadd17853 Author: Alfonso S. Siciliano AuthorDate: 2022-03-22 23:52:22 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-22 23:58:48 +0000 bsdinstall hardening: Replace dialog with bsddialog bsdinstall/scripts/hardening: Replace (LGPL) dialog utility with (BSD-2-CLAUSE) dialog utility. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34102 --- usr.sbin/bsdinstall/scripts/hardening | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/hardening b/usr.sbin/bsdinstall/scripts/hardening index 58ea0a112e26..065241ef8b25 100755 --- a/usr.sbin/bsdinstall/scripts/hardening +++ b/usr.sbin/bsdinstall/scripts/hardening @@ -26,14 +26,14 @@ # # $FreeBSD$ -: ${DIALOG_OK=0} +: ${BSDDIALOG_OK=0} echo -n > $BSDINSTALL_TMPETC/rc.conf.hardening echo -n > $BSDINSTALL_TMPETC/sysctl.conf.hardening echo -n > $BSDINSTALL_TMPBOOT/loader.conf.hardening exec 3>&1 -FEATURES=$( dialog --backtitle "FreeBSD Installer" \ +FEATURES=$( bsddialog --backtitle "FreeBSD Installer" \ --title "System Hardening" --nocancel --separate-output \ --checklist "Choose system security hardening options:" \ 0 0 0 \ @@ -49,8 +49,13 @@ FEATURES=$( dialog --backtitle "FreeBSD Installer" \ "9 secure_console" "Enable console password prompt" ${secure_console:-off} \ "10 disable_ddtrace" "Disallow DTrace destructive-mode" ${disable_ddtrace:-off} \ 2>&1 1>&3 ) +retval=$? exec 3>&- +if [ $retval -ne $BSDDIALOG_OK ]; then + exit 1 +fi + for feature in $FEATURES; do case "$feature" in hide_uids) @@ -88,4 +93,3 @@ for feature in $FEATURES; do ;; esac done -