git: 19bb1886be4f - main - bsdinstall: rename "Live CD" to "Live System"

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=19bb1886be4f366e922f0be359874683a243624a

commit 19bb1886be4f366e922f0be359874683a243624a
Author:     Pierre Pronchery <pierre@freebsdfoundation.org>
AuthorDate: 2023-12-29 18:23:48 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-12-29 20:24:25 +0000

    bsdinstall: rename "Live CD" to "Live System"
    
    This uses more generic wording in the FreeBSD installer, when offering
    the user to use the system booted without running the installer.
    
    The updated wording is also reflected in freebsd-version(1).
    
    Reviewed by:            emaste
    Sponsored by:           The FreeBSD Foundation
    Differential revision:  https://reviews.freebsd.org/D43233
---
 bin/freebsd-version/freebsd-version.1 | 2 +-
 usr.sbin/bsdinstall/startbsdinstall   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
index b9f0861f890a..82ea9c707d69 100644
--- a/bin/freebsd-version/freebsd-version.1
+++ b/bin/freebsd-version/freebsd-version.1
@@ -111,7 +111,7 @@ To determine the version of the currently running userland:
 /bin/freebsd-version -u
 .Ed
 .Pp
-To inspect a system being repaired using a live CD:
+To inspect a system being repaired using a live system:
 .Bd -literal -offset indent
 mount -rt ufs /dev/ada0p2 /mnt
 env ROOT=/mnt /mnt/bin/freebsd-version -ku
diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall
index af0fd56e73b3..63239c969ac6 100644
--- a/usr.sbin/bsdinstall/startbsdinstall
+++ b/usr.sbin/bsdinstall/startbsdinstall
@@ -57,7 +57,7 @@ if [ -f /etc/installerconfig ]; then
 	exit 
 fi
 
-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
+bsddialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live system?" 0 0
 
 case $? in
 $BSDDIALOG_OK)	# Install
@@ -70,7 +70,7 @@ $BSDDIALOG_OK)	# Install
 	trap true SIGINT	# Ignore cntrl-C here
 	bsdinstall
 	if [ $? -eq 0 ]; then
-		bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live CD" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0
+		bsddialog --backtitle "FreeBSD Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0
 
 		case $? in
 		$BSDDIALOG_OK)		# Reboot
@@ -90,7 +90,7 @@ $BSDDIALOG_OK)	# Install
 				sleep 1
 			done
 			;;
-		$BSDDIALOG_CANCEL)	# Live CD
+		$BSDDIALOG_CANCEL)	# Live System
 			exit 0
 			;;
 		esac
@@ -98,7 +98,7 @@ $BSDDIALOG_OK)	# Install
 		. "$0"
 	fi
 	;;
-$BSDDIALOG_CANCEL)	# Live CD
+$BSDDIALOG_CANCEL)	# Live System
 	exit 0
 	;;
 $BSDDIALOG_EXTRA)	# Shell