Skip to content

Commit

Permalink
bsdinstall: rename "Live CD" to "Live System"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
khorben authored and emaste committed Dec 29, 2023
1 parent 7963968 commit 19bb188
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/freebsd-version/freebsd-version.1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions usr.sbin/bsdinstall/startbsdinstall
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -90,15 +90,15 @@ $BSDDIALOG_OK) # Install
sleep 1
done
;;
$BSDDIALOG_CANCEL) # Live CD
$BSDDIALOG_CANCEL) # Live System
exit 0
;;
esac
else
. "$0"
fi
;;
$BSDDIALOG_CANCEL) # Live CD
$BSDDIALOG_CANCEL) # Live System
exit 0
;;
$BSDDIALOG_EXTRA) # Shell
Expand Down

0 comments on commit 19bb188

Please sign in to comment.