Page MenuHomeFreeBSD
Files F99164913

D43638.diff
No OneTemporary
Actions

D43638.diff
View Options

diff --git a/usr.sbin/bsdinstall/partedit/part_wizard.c b/usr.sbin/bsdinstall/partedit/part_wizard.c
--- a/usr.sbin/bsdinstall/partedit/part_wizard.c
+++ b/usr.sbin/bsdinstall/partedit/part_wizard.c
@@ -66,7 +66,7 @@
if (error != 0)
return (1);
- bsddialog_backtitle(&conf, "FreeBSD Installer");
+ bsddialog_backtitle(&conf, OSNAME " Installer");
disk = boot_disk_select(&mesh);
if (disk == NULL) {
geom_deletetree(&mesh);
@@ -74,7 +74,7 @@
}
bsddialog_clear(0);
- bsddialog_backtitle(&conf, "FreeBSD Installer");
+ bsddialog_backtitle(&conf, OSNAME " Installer");
schemeroot = wizard_partition(&mesh, disk);
free(disk);
geom_deletetree(&mesh);
@@ -82,7 +82,7 @@
return (1);
bsddialog_clear(0);
- bsddialog_backtitle(&conf, "FreeBSD Installer");
+ bsddialog_backtitle(&conf, OSNAME " Installer");
error = geom_gettree(&mesh);
if (error != 0) {
free(schemeroot);
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -125,7 +125,7 @@
while (prompt != NULL) {
bsddialog_clear(0);
if (!sade_mode)
- bsddialog_backtitle(&conf, "FreeBSD Installer");
+ bsddialog_backtitle(&conf, OSNAME " Installer");
error = geom_gettree(&mesh);
if (error == 0)
@@ -137,7 +137,7 @@
"installation menu.", 0, 0);
break;
}
-
+
get_mount_points(items, nitems);
if (i >= nitems)
diff --git a/usr.sbin/bsdinstall/startbsdinstall b/usr.sbin/bsdinstall/startbsdinstall
--- a/usr.sbin/bsdinstall/startbsdinstall
+++ b/usr.sbin/bsdinstall/startbsdinstall
@@ -1,5 +1,8 @@
#!/bin/sh
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
: ${BSDDIALOG_OK=0}
: ${BSDDIALOG_CANCEL=1}
: ${BSDDIALOG_HELP=2}
@@ -27,7 +30,7 @@
else
# Serial or other console
echo
- echo "Welcome to FreeBSD!"
+ echo "Welcome to ${OSNAME}!"
echo
echo "Please choose the appropriate terminal type for your system."
echo "Common console types are:"
@@ -46,18 +49,18 @@
if [ -f /etc/installerconfig ]; then
if [ "$1" != "primary" ]; then
- bsddialog --backtitle "FreeBSD Installer" --title "Installing" --msgbox "FreeBSD is being installed from a script; please use the primary console." 0 0
+ bsddialog --backtitle "${OSNAME} Installer" --title "Installing" --msgbox "${OSNAME} is being installed from a script; please use the primary console." 0 0
. "$0"
elif bsdinstall script /etc/installerconfig; then
- bsddialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10
+ bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of ${OSNAME} complete! Rebooting in 10 seconds" 10 30 10
reboot
else
- bsddialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0
+ bsddialog --backtitle "${OSNAME} Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0
fi
exit
fi
-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
+bsddialog --backtitle "${OSNAME} Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live System" --yesno "Welcome to ${OSNAME}! Would you like to begin an installation or use the live system?" 0 0
case $? in
$BSDDIALOG_OK) # Install
@@ -70,7 +73,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 System" --yesno "Installation of FreeBSD complete! Would you like to reboot into the installed system now?" 0 0
+ bsddialog --backtitle "${OSNAME} Installer" --title "Complete" --ok-label "Reboot" --extra-button --extra-label "Shutdown" --cancel-label "Live System" --yesno "Installation of ${OSNAME} complete! Would you like to reboot into the installed system now?" 0 0
case $? in
$BSDDIALOG_OK) # Reboot

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 7, 11:23 PM (21 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13803603
Default Alt Text
D43638.diff (4 KB)

Event Timeline