jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 00:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bsdinstall: rename "Live CD" to "Live System"

Browse Source 
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

(cherry picked from commit 19bb1886be)
This commit is contained in:
Pierre Pronchery 2023-12-29 19:23:48 +01:00 committed by Ed Maste
parent 68584c97ec
commit 66be605375
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/freebsd-version/freebsd-version.1
View File

@ -111,7 +111,7 @@ To determine the version of the currently running userland:
/bin/freebsd-version -u /bin/freebsd-version -u
.Ed .Ed
.Pp .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 .Bd -literal -offset indent
mount -rt ufs /dev/ada0p2 /mnt mount -rt ufs /dev/ada0p2 /mnt
env ROOT=/mnt /mnt/bin/freebsd-version -ku env ROOT=/mnt /mnt/bin/freebsd-version -ku

8
usr.sbin/bsdinstall/startbsdinstall
View File

@ -57,7 +57,7 @@ if [ -f /etc/installerconfig ]; then
exit exit
fi 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 case $? in
$BSDDIALOG_OK) # Install $BSDDIALOG_OK) # Install
@ -70,7 +70,7 @@ $BSDDIALOG_OK) # Install
trap true SIGINT # Ignore cntrl-C here trap true SIGINT # Ignore cntrl-C here
bsdinstall bsdinstall
if [ $? -eq 0 ]; then 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 case $? in
$BSDDIALOG_OK) # Reboot $BSDDIALOG_OK) # Reboot
@ -90,7 +90,7 @@ $BSDDIALOG_OK) # Install
sleep 1 sleep 1
done done
;; ;;
$BSDDIALOG_CANCEL) # Live CD $BSDDIALOG_CANCEL) # Live System
exit 0 exit 0
;; ;;
esac esac
@ -98,7 +98,7 @@ $BSDDIALOG_OK) # Install
. "$0" . "$0"
fi fi
;; ;;
$BSDDIALOG_CANCEL) # Live CD $BSDDIALOG_CANCEL) # Live System
exit 0 exit 0
;; ;;
$BSDDIALOG_EXTRA) # Shell $BSDDIALOG_EXTRA) # Shell