From nobody Wed Oct 11 16:33:50 2023 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 4S5JHf5DPsz4wMrr; Wed, 11 Oct 2023 16:33:50 +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 4S5JHf4fGZz4JDB; Wed, 11 Oct 2023 16:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697042030; 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=H8o8Q0XDDMEWlzr0YspwYvU93ueCQ2bS8D3rRIJvf2w=; b=uX3M3nHHHkPzP+irhRhSvxfpwiIeIfyh+jIarit+AaWw0zjT0pm+KnBPcitoy/SnZOjg4g Qt6R3TpHK0VebJoyebDInp2fKUaYwC0xczHQAiyWUgYduRcCvEUFVMM1laIM6049SEh72Q YrDha/Eqt750qCQLmMbtgYvQGKn0vbKCCZijhBwHW5Ut9W9Qh1UIxeUonEj4IrpqFxEUJW WNT8ryl6q4OAn7ChRZC7n3UyEoKSB40Vxuayu2gjq0gDyV+f4/KCXatDvoHzbXuuv6xoyB a9L6v44BYc0PotSg+rDHwUPdsL3fvEpvjm5jjHpxv6FrCGLRcvlYPF14L/INdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697042030; a=rsa-sha256; cv=none; b=VuNuRqoOEPz4HP1Zdw12Ad5axxMBAsPQ9NJyr2G3pTW7DpkYk3hc+nSUfCwQ2hppPbySMR blmG2P89o0TJFr8DBteFBiGBAo6HhJzzSDTksFTadKpJkZy9C2B0hOT3KKjbk0vRJIAU0u uNHnSQf7UgZh/Gl/pMI4tWyplCM/qGlrooVTD/dszlyMuU9/Yzn0Uoa93xZN2lU1+HqUsq wi1/tfBgZXP9+o2XKM9dW5gom0noZaCbKoIIekU8gtcLuVWaSft2kMc9nxz8+nplLQKr9q nVucc3Iywlzyv5AK6XCiSkK3Zz+WR+CYJqYIVWKUPGidGdiaqXTYuKR/JLOkhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697042030; 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=H8o8Q0XDDMEWlzr0YspwYvU93ueCQ2bS8D3rRIJvf2w=; b=HhRrpNjRqru/WZ/UGL28wLuto3Cbrjb8+UWCcrMaScpPaKCwoqljHOnW3Ue93gILY1hBGE j6kfgGaLoRHczHrjU8sFluURa9Ex8vFv4i1a1Nt04wqYdyObqFlY7Ha0DqQa77qStQz9zh iqNLVGn32uO2WDNPLEHxw165j8GxQIUodEtrMCxgNaYB6wypqnZcfzjqRlRqZOJc5453uv 1Jl5NEaY2u34Hn7FlcOGfEj346LkigMLULK2+Odp5N26Xcs/bWU4crnY7ZIdj4FhRM2G7l rQkAJX3zNx8OnnhzfuU+niI7KFRP2y5z5T9Lp3uAhU/RwYBKtrbfEdSN3ASRsg== 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 4S5JHf3jMszDVZ; Wed, 11 Oct 2023 16:33:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39BGXouf007340; Wed, 11 Oct 2023 16:33:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BGXota007337; Wed, 11 Oct 2023 16:33:50 GMT (envelope-from git) Date: Wed, 11 Oct 2023 16:33:50 GMT Message-Id: <202310111633.39BGXota007337@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: 04b465777a09 - main - bsdinstall auto: replace dialog with bsddialog 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: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04b465777a0939dab4d8b4837239881a3a4d39be Auto-Submitted: auto-generated The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=04b465777a0939dab4d8b4837239881a3a4d39be commit 04b465777a0939dab4d8b4837239881a3a4d39be Author: Alfonso S. Siciliano AuthorDate: 2023-10-11 16:18:46 +0000 Commit: Alfonso S. Siciliano CommitDate: 2023-10-11 16:33:25 +0000 bsdinstall auto: replace dialog with bsddialog bsdinstall/scripts/auto: Replace dialog(1) with bsddialog(1). --- usr.sbin/bsdinstall/scripts/auto | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto index 95084f1bdcc3..742f319e15ad 100755 --- a/usr.sbin/bsdinstall/scripts/auto +++ b/usr.sbin/bsdinstall/scripts/auto @@ -160,7 +160,7 @@ if [ -f $BSDINSTALL_DISTDIR/MANIFEST ]; then if [ -n "$DISTMENU" ]; then exec 5>&1 - EXTRA_DISTS=$( eval dialog \ + EXTRA_DISTS=$( eval bsddialog \ --backtitle \"$OSNAME Installer\" \ --title \"Distribution Select\" --nocancel --separate-output \ --checklist \"Choose optional system components to install:\" \ @@ -180,7 +180,7 @@ for dist in $DISTRIBUTIONS; do done if [ -n "$FETCH_DISTRIBUTIONS" -a -n "$BSDINSTALL_CONFIGCURRENT" ]; then - dialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 + bsddialog --backtitle "$OSNAME Installer" --title "Network Installation" --msgbox "Some installation files were not found on the boot volume. The next few screens will allow you to configure networking so that they can be downloaded from the Internet." 0 0 bsdinstall netconfig || error NETCONFIG_DONE=yes fi @@ -302,7 +302,7 @@ case $CURARCH in esac exec 5>&1 -PARTMODE=`echo $PMODES | xargs dialog --backtitle "$OSNAME Installer" \ +PARTMODE=`echo $PMODES | xargs -o bsddialog --backtitle "$OSNAME Installer" \ --title "Partitioning" \ --item-help \ --menu "How would you like to partition your disk?" \ @@ -365,14 +365,14 @@ fi [ -z "$BSDINSTALL_SKIP_SERVICES" ] && bsdinstall services [ -z "$BSDINSTALL_SKIP_HARDENING" ] && bsdinstall hardening -[ -z "$BSDINSTALL_SKIP_USERS" ] && dialog --backtitle "$OSNAME Installer" \ +[ -z "$BSDINSTALL_SKIP_USERS" ] && bsddialog --backtitle "$OSNAME Installer" \ --title "Add User Accounts" --yesno \ "Would you like to add users to the installed system now?" 0 0 && \ bsdinstall adduser finalconfig() { exec 5>&1 - REVISIT=$(dialog --backtitle "$OSNAME Installer" \ + REVISIT=$(bsddialog --backtitle "$OSNAME Installer" \ --title "Final Configuration" --no-cancel --menu \ "Setup of your $OSNAME system is nearly complete. You can now modify your configuration choices. After this screen, you will have an opportunity to make more complex changes using a shell." 0 0 0 \ "Exit" "Apply configuration and exit installer" \ @@ -435,8 +435,8 @@ fi [ -f /usr/libexec/bsdinstall/local.post-configure ] && f_dprintf "Running local.post-configure" && sh /usr/libexec/bsdinstall/local.post-configure "$BSDINSTALL_CHROOT" if [ -z "$BSDINSTALL_SKIP_MANUAL" ]; then - dialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \ - --default-button no --yesno \ + bsddialog --backtitle "$OSNAME Installer" --title "Manual Configuration" \ + --default-no --yesno \ "The installation is now finished. Before exiting the installer, would you like to open a shell in the new system to make any final manual modifications?" 0 0 if [ $? -eq 0 ]; then clear