From nobody Fri Mar 25 23:22:39 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 C7C4E1A3E11A; Fri, 25 Mar 2022 23:22:39 +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 4KQJ675GMxz3Qtn; Fri, 25 Mar 2022 23:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648250559; 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=SFg/F55uxL8T06J2hSesBukV/+83GI6PKzaKgMOl8WY=; b=dOgQX4y0vCePsZrSt6WJvhVXgh/+D1q3SqLLsWsGY5z/C7cKfRz/cZ9obZhG+1RA7UxETe X5ENn4WJnBCAt5WS9sehwBZl0IIkIZTo/n95BH3d0RhivlN+Hs76ynXCC7EABDzKbDvsC7 VqQWJcMi9gCEoWj1lMhDIJ9oCGR1IzgSL2SsWR5T3KFFEg+sfYVN7Akl3OZBvNcwWNHay9 gIkbnSgVjqXhDL4gm0YR1ooNxCvzOVMfJQiqLjBpa3PXB8QDQlq0zIXGGB/Kw2QhtF6KDG VQgZD7Vb8e+O4067dzLHr42Jw1NeDSoV7B+wjgRhR3Qsolfu5kw9T7HKuHlchg== 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 957A515D58; Fri, 25 Mar 2022 23:22:39 +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 22PNMden016318; Fri, 25 Mar 2022 23:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PNMd9G016317; Fri, 25 Mar 2022 23:22:39 GMT (envelope-from git) Date: Fri, 25 Mar 2022 23:22:39 GMT Message-Id: <202203252322.22PNMd9G016317@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: 852d975ccfee - main - bsdinstall services: 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: 852d975ccfeef053d81fdf1ab051f7c4cfc07613 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648250559; 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=SFg/F55uxL8T06J2hSesBukV/+83GI6PKzaKgMOl8WY=; b=WI/+a7wkVAjwpRD5mryCoNNEQgkJVq0fT7sOdrXlYF/dBklnFLELqzTjFJj7xdYKxVTvyh DcFdbzoUPtH22tZTE8WZlrCOBQGGiLnHqUUonao1AZ6x5JuCBGADywB4ssI9dX22pqmheL 6Z2eXvEOvPOtLKKzzQZJp9PjPF9i9rZ/B9Y3EO+WxA+o6Cu3DrfSQ1kJ1sqpYOxoGjrC2q AOV0hMwE8gPzBO8AxnH3v/ZNXTt7ydxZZwV2tnGoMHC7QF8oJh4zoiOMO1J5WDHXqaLhcF yjMMC3nHE8lqhONEeoR0z4xVJu/EGbFVBdByGXhtxE4NQ+KkiOgp9UeFW5sXTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648250559; a=rsa-sha256; cv=none; b=oYgC+gtjV1bLcbeLaM9vkUpjDfoWuWMaqWGGw6SgjF9YVYFLQIwQZbqoP/8FCzq4iScq43 CJHrygJiMNNQCe8egc2n/xdIrMvlY+lJ92Sd1PolqA1PEVsMXqTkmj9xkhEqZmRm+mzLD9 eDchzCL0juifa4CUPiia+fHAaywhbQNRVVWgqUgkmSZibnnDQogJZU1P6PbuSSlZ2VDMZY 0e9/qNKRCDNbed+aX3sf56Nnpoz3jCfpGNNMQCloN6BGCOt2WIC6TQzdxgs9XkMwEaZLCt 2htNpIXLO2LXCYNQcB1ob6SLkeD6M2jw9MawXjls5yBmrgPR3klMS8Det18png== 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=852d975ccfeef053d81fdf1ab051f7c4cfc07613 commit 852d975ccfeef053d81fdf1ab051f7c4cfc07613 Author: Alfonso S. Siciliano AuthorDate: 2022-03-25 23:19:36 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-25 23:22:10 +0000 bsdinstall services: Replace dialog with bsddialog Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34640 --- usr.sbin/bsdinstall/scripts/services | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services index c59628b2a88c..f9141a523a31 100755 --- a/usr.sbin/bsdinstall/scripts/services +++ b/usr.sbin/bsdinstall/scripts/services @@ -26,7 +26,7 @@ # # $FreeBSD$ -: ${DIALOG_OK=0} +: ${BSDDIALOG_OK=0} if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then eval $( sed -e s/YES/on/i -e s/NO/off/i \ @@ -39,8 +39,8 @@ fi echo -n > $BSDINSTALL_TMPETC/rc.conf.services exec 3>&1 -DAEMONS=$( dialog --backtitle "FreeBSD Installer" \ - --title "System Configuration" --nocancel --separate-output \ +DAEMONS=$( bsddialog --backtitle "FreeBSD 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} \ @@ -53,8 +53,13 @@ DAEMONS=$( dialog --backtitle "FreeBSD Installer" \ ${powerd_enable:-off} \ dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \ 2>&1 1>&3 ) +retval=$? exec 3>&- +if [ $retval -ne $BSDDIALOG_OK ]; then + exit 1 +fi + havedump= for daemon in $DAEMONS; do [ "$daemon" = "dumpdev" ] && havedump=1 continue