The branch main has been updated by asiciliano:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d6e7b1af305e640e7521c5ba11c4723d81e8791f
commit d6e7b1af305e640e7521c5ba11c4723d81e8791f
Author: Alfonso S. Siciliano <asicili...@freebsd.org>
AuthorDate: 2022-03-29 13:16:09 +0000
Commit: Alfonso S. Siciliano <asicili...@freebsd.org>
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
