mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-22 02:37:15 +00:00
bsdinstall: complete whitelabeling the installer
The commit 147585b489
introduces
whitlabeling. This commit addresses couple more places where the
os name was missed.
Reviewed by: imp, asiciliano, brd
Differential Revision: https://reviews.freebsd.org/D43638
This commit is contained in:
parent
a03f768612
commit
cd724c2592
|
@ -66,7 +66,7 @@ part_wizard(const char *fsreq)
|
||||||
if (error != 0)
|
if (error != 0)
|
||||||
return (1);
|
return (1);
|
||||||
|
|
||||||
bsddialog_backtitle(&conf, "FreeBSD Installer");
|
bsddialog_backtitle(&conf, OSNAME " Installer");
|
||||||
disk = boot_disk_select(&mesh);
|
disk = boot_disk_select(&mesh);
|
||||||
if (disk == NULL) {
|
if (disk == NULL) {
|
||||||
geom_deletetree(&mesh);
|
geom_deletetree(&mesh);
|
||||||
|
@ -74,7 +74,7 @@ part_wizard(const char *fsreq)
|
||||||
}
|
}
|
||||||
|
|
||||||
bsddialog_clear(0);
|
bsddialog_clear(0);
|
||||||
bsddialog_backtitle(&conf, "FreeBSD Installer");
|
bsddialog_backtitle(&conf, OSNAME " Installer");
|
||||||
schemeroot = wizard_partition(&mesh, disk);
|
schemeroot = wizard_partition(&mesh, disk);
|
||||||
free(disk);
|
free(disk);
|
||||||
geom_deletetree(&mesh);
|
geom_deletetree(&mesh);
|
||||||
|
@ -82,7 +82,7 @@ part_wizard(const char *fsreq)
|
||||||
return (1);
|
return (1);
|
||||||
|
|
||||||
bsddialog_clear(0);
|
bsddialog_clear(0);
|
||||||
bsddialog_backtitle(&conf, "FreeBSD Installer");
|
bsddialog_backtitle(&conf, OSNAME " Installer");
|
||||||
error = geom_gettree(&mesh);
|
error = geom_gettree(&mesh);
|
||||||
if (error != 0) {
|
if (error != 0) {
|
||||||
free(schemeroot);
|
free(schemeroot);
|
||||||
|
|
|
@ -125,7 +125,7 @@ main(int argc, const char **argv)
|
||||||
while (prompt != NULL) {
|
while (prompt != NULL) {
|
||||||
bsddialog_clear(0);
|
bsddialog_clear(0);
|
||||||
if (!sade_mode)
|
if (!sade_mode)
|
||||||
bsddialog_backtitle(&conf, "FreeBSD Installer");
|
bsddialog_backtitle(&conf, OSNAME " Installer");
|
||||||
|
|
||||||
error = geom_gettree(&mesh);
|
error = geom_gettree(&mesh);
|
||||||
if (error == 0)
|
if (error == 0)
|
||||||
|
@ -137,7 +137,7 @@ main(int argc, const char **argv)
|
||||||
"installation menu.", 0, 0);
|
"installation menu.", 0, 0);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
get_mount_points(items, nitems);
|
get_mount_points(items, nitems);
|
||||||
|
|
||||||
if (i >= nitems)
|
if (i >= nitems)
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
BSDCFG_SHARE="/usr/share/bsdconfig"
|
||||||
|
. $BSDCFG_SHARE/common.subr || exit 1
|
||||||
|
|
||||||
: ${BSDDIALOG_OK=0}
|
: ${BSDDIALOG_OK=0}
|
||||||
: ${BSDDIALOG_CANCEL=1}
|
: ${BSDDIALOG_CANCEL=1}
|
||||||
: ${BSDDIALOG_HELP=2}
|
: ${BSDDIALOG_HELP=2}
|
||||||
|
@ -27,7 +30,7 @@ if [ $? -eq 0 ]; then
|
||||||
else
|
else
|
||||||
# Serial or other console
|
# Serial or other console
|
||||||
echo
|
echo
|
||||||
echo "Welcome to FreeBSD!"
|
echo "Welcome to ${OSNAME}!"
|
||||||
echo
|
echo
|
||||||
echo "Please choose the appropriate terminal type for your system."
|
echo "Please choose the appropriate terminal type for your system."
|
||||||
echo "Common console types are:"
|
echo "Common console types are:"
|
||||||
|
@ -46,18 +49,18 @@ resizewin -z
|
||||||
|
|
||||||
if [ -f /etc/installerconfig ]; then
|
if [ -f /etc/installerconfig ]; then
|
||||||
if [ "$1" != "primary" ]; 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"
|
. "$0"
|
||||||
elif bsdinstall script /etc/installerconfig; then
|
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
|
reboot
|
||||||
else
|
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
|
fi
|
||||||
exit
|
exit
|
||||||
fi
|
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
|
case $? in
|
||||||
$BSDDIALOG_OK) # Install
|
$BSDDIALOG_OK) # Install
|
||||||
|
@ -70,7 +73,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 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
|
case $? in
|
||||||
$BSDDIALOG_OK) # Reboot
|
$BSDDIALOG_OK) # Reboot
|
||||||
|
|
Loading…
Reference in a new issue