Page MenuHomeFreeBSD

D43233.diff
No OneTemporary

D43233.diff

diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
--- a/bin/freebsd-version/freebsd-version.1
+++ b/bin/freebsd-version/freebsd-version.1
@@ -111,7 +111,7 @@
/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
--- a/usr.sbin/bsdinstall/startbsdinstall
+++ b/usr.sbin/bsdinstall/startbsdinstall
@@ -57,7 +57,7 @@
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 @@
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 @@
sleep 1
done
;;
- $BSDDIALOG_CANCEL) # Live CD
+ $BSDDIALOG_CANCEL) # Live System
exit 0
;;
esac
@@ -98,7 +98,7 @@
. "$0"
fi
;;
-$BSDDIALOG_CANCEL) # Live CD
+$BSDDIALOG_CANCEL) # Live System
exit 0
;;
$BSDDIALOG_EXTRA) # Shell

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 14, 10:37 PM (8 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14634675
Default Alt Text
D43233.diff (2 KB)

Event Timeline