From nobody Tue Mar 29 13:21:29 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 467AF1A36F06; Tue, 29 Mar 2022 13:21:30 +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 4KSVZf1YVFz3C6G; Tue, 29 Mar 2022 13:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648560090; 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=uXFkpXI7C0+LPXwL2IRPTQyLclXIKKcWXkfuKTIpwPA=; b=QehUhZh0JcUdsLY5qsKfws3goakj8prV3WaBVZoRrky/gD3P0+hxyESMIexOb7c+zpuBYV 3UMOrYPFnryxNyj8ZftC+8lybgpqb5+cV/Emumj3eSjE02gEZlq03mwDq4tH42G9ZhErhg FrIOkrRHfdzRFyD4RbEkpSYUs8z8vnABje7dRFkbh0ejctYS8doiU2JHMM+cnHA0LBIsHh FnZabHBGgiX9lZ7r7H3aa3LhT74mb4KiKjuDN6Op9DMsthY9DR6dKKy9tDhvdpwRSuo2TJ KhP3vhlYF82MDLIpl3a3jmmmCHD6mLCcmjb/ZBWwHX0sC9JBP/DNhgaZkoWE2g== 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 138201F622; Tue, 29 Mar 2022 13:21:30 +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 22TDLT3g067497; Tue, 29 Mar 2022 13:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TDLTbG067496; Tue, 29 Mar 2022 13:21:29 GMT (envelope-from git) Date: Tue, 29 Mar 2022 13:21:29 GMT Message-Id: <202203291321.22TDLTbG067496@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: d6e7b1af305e - main - release/rc.local: 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: d6e7b1af305e640e7521c5ba11c4723d81e8791f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648560090; 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=uXFkpXI7C0+LPXwL2IRPTQyLclXIKKcWXkfuKTIpwPA=; b=onXZClJAWCAVs/p62TAqyeOR5P4H+YAcWMCKDSgFgRpV/XRglF00P8xz1fXdry4uCsA+6G VBVVF66OSHO5H4EmNTAyDhWfbQn3r0nabV2Z7WaUiVCN3BxoLSxev4ZtvS9Imb3WcdQ4HF 2Xlgro0qmm2NmNYbSk/TcHBk7FX8OlR2R9U/hg5OL0AVDc3ImTm4shpbLSHUVDKp3keymO 9QVDfJc5MlkYbynCmj5gXVdRt275zWX9FQ8XTUIn6PG53uAfwvPuyVOI9Kjq5Kr2ri28Cn 2y2cJIsvVc8bNi0uJio+KE6NBuoxyZD33+Wk/MBtMOeveojuIdPsIiAUxTPgiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648560090; a=rsa-sha256; cv=none; b=t5Qp+oUfZlmWidOTl0+LVQMlkD/3t67uFUj8di6Oy2GyicNK04nytV4Onvdhybn/Dqn9Za FMotZFTdTCkR/dyFPCMDRpjsuax2nChTPjtw8dCC8dEOwBK2BjSmOxZ+LpmsGBj1T7q+Gc 5+QMGIc0T3d+9hCHG7z0l64qLyeGrPs8BU4njcep+xt4dNvXEpz7WGYvFDhRhd2u3Jd4Si 5KBDfe+ysvFJOBYw5tGXuOS6wkA9BrH0UxRqkULN1qBVNMKiWHcGDppooj8RTpLZPhIwe8 biPZIfHK0RYgBZL/qEmUDemv+t6TdMegS3idn3r0Bj/Zf04lSsxMln6A/3bTVQ== 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=d6e7b1af305e640e7521c5ba11c4723d81e8791f commit d6e7b1af305e640e7521c5ba11c4723d81e8791f Author: Alfonso S. Siciliano AuthorDate: 2022-03-29 13:16:09 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-03-29 13:21:02 +0000 release/rc.local: Replace dialog with bsddialog Replace (LGPL) dialog utility with (BSD-2-Clause) bsddialog utility. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34678 --- release/rc.local | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/release/rc.local b/release/rc.local index 8162cd1efff6..023c3dce1021 100755 --- a/release/rc.local +++ b/release/rc.local @@ -1,12 +1,12 @@ #!/bin/sh # $FreeBSD$ -: ${DIALOG_OK=0} -: ${DIALOG_CANCEL=1} -: ${DIALOG_HELP=2} -: ${DIALOG_EXTRA=3} -: ${DIALOG_ITEM_HELP=4} -: ${DIALOG_ESC=255} +: ${BSDDIALOG_OK=0} +: ${BSDDIALOG_CANCEL=1} +: ${BSDDIALOG_HELP=2} +: ${BSDDIALOG_EXTRA=3} +: ${BSDDIALOG_ESC=5} +: ${BSDDIALOG_ERROR=255} MACHINE=`uname -m` @@ -50,18 +50,18 @@ export TERM if [ -f /etc/installerconfig ]; then if bsdinstall script /etc/installerconfig; then - dialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 + bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 reboot else - dialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 + bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 fi exit fi -dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 +bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 case $? in -$DIALOG_OK) # Install +$BSDDIALOG_OK) # Install # If not netbooting, have the installer configure the network dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` if [ ${dlv:=0} -eq 0 -a ! -f /etc/diskless ]; then @@ -71,15 +71,15 @@ $DIALOG_OK) # Install trap true SIGINT # Ignore cntrl-C here bsdinstall if [ $? -eq 0 ]; then - dialog --backtitle "FreeBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot + bsddialog --backtitle "FreeBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot else . /etc/rc.local fi ;; -$DIALOG_CANCEL) # Live CD +$BSDDIALOG_CANCEL) # Live CD exit 0 ;; -$DIALOG_EXTRA) # Shell +$BSDDIALOG_EXTRA) # Shell clear echo "When finished, type 'exit' to return to the installer." /bin/sh