Various changes to the messages so that they are now appropriate for both
CD and DVD releases of FreeBSD.
This commit is contained in:
parent
8b2cea330f
commit
38363ccec2
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=78889
@ -269,11 +269,11 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
(void)rmdir("/mnt2");
|
||||
|
||||
while (1) {
|
||||
msgConfirm("Please insert a FreeBSD live filesystem CDROM and press return");
|
||||
msgConfirm("Please insert a FreeBSD live filesystem CD/DVD and press return");
|
||||
if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
|
||||
/* If we can't initialize it, it's probably not a FreeBSD CDROM so punt on it */
|
||||
mediaClose();
|
||||
if (msgYesNo("Unable to mount the CDROM - do you want to try again?") != 0)
|
||||
if (msgYesNo("Unable to mount the disc - do you want to try again?") != 0)
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
else
|
||||
@ -284,7 +284,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
* a little kludge dance here..
|
||||
*/
|
||||
if (symlink("/dist", "/mnt2")) {
|
||||
msgConfirm("Unable to symlink /mnt2 to the CDROM mount point. Please report this\n"
|
||||
msgConfirm("Unable to symlink /mnt2 to the disc mount point. Please report this\n"
|
||||
"unexpected failure to freebsd-bugs@FreeBSD.org.");
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
@ -307,7 +307,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
Mkdir("/var/run");
|
||||
if (vsystem("/mnt2/sbin/ldconfig -s /mnt2/usr/lib")) {
|
||||
msgConfirm("Warning: ldconfig could not create the ld.so hints file.\n"
|
||||
"Dynamic executables from the CDROM likely won't work.");
|
||||
"Dynamic executables from the disc likely won't work.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -320,7 +320,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
if (!file_readable("/usr/libexec/ld-elf.so.1")) {
|
||||
if (symlink("/mnt2/usr/libexec/ld-elf.so.1", "/usr/libexec/ld-elf.so.1")) {
|
||||
msgConfirm("Warning: could not create the symlink for ld-elf.so.1\n"
|
||||
"Dynamic executables from the CDROM likely won't work.");
|
||||
"Dynamic executables from the disc likely won't work.");
|
||||
}
|
||||
}
|
||||
/* optional nicety */
|
||||
|
@ -152,7 +152,7 @@ main(int argc, char **argv)
|
||||
|| !msgNoYes("Are you sure you wish to exit? The system will halt.")
|
||||
#else
|
||||
|| !msgNoYes("Are you sure you wish to exit? The system will reboot\n"
|
||||
"(be sure to remove any floppies/CDROMs from the drives).")
|
||||
"(be sure to remove any floppies/CDs/DVDs from the drives).")
|
||||
#endif
|
||||
)
|
||||
break;
|
||||
|
@ -240,7 +240,7 @@ DMenu MenuIndex = {
|
||||
{ " Media, Tape", "Select tape installation media.", NULL, mediaSetTape },
|
||||
{ " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS },
|
||||
{ " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy },
|
||||
{ " Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM },
|
||||
{ " Media, CDROM/DVD", "Select CDROM/DVD installation media.", NULL, mediaSetCDROM },
|
||||
{ " Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS },
|
||||
{ " Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS },
|
||||
{ " Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP },
|
||||
@ -410,11 +410,11 @@ DMenu MenuMouse = {
|
||||
|
||||
DMenu MenuMediaCDROM = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Choose a CDROM type",
|
||||
"FreeBSD can be installed directly from a CDROM containing a valid\n"
|
||||
"Choose a CD/DVD type",
|
||||
"FreeBSD can be installed directly from a CD/DVD containing a valid\n"
|
||||
"FreeBSD distribution. If you are seeing this menu it is because\n"
|
||||
"more than one CDROM drive was found on your system. Please select one\n"
|
||||
"of the following CDROM drives as your installation drive.",
|
||||
"more than one CD/DVD drive was found on your system. Please select one\n"
|
||||
"of the following CD/DVD drives as your installation drive.",
|
||||
"Press F1 to read the installation guide",
|
||||
"INSTALL",
|
||||
{ { NULL } },
|
||||
@ -692,12 +692,12 @@ DMenu MenuMedia = {
|
||||
"Choose Installation Media",
|
||||
"FreeBSD can be installed from a variety of different installation\n"
|
||||
"media, ranging from floppies to an Internet FTP server. If you're\n"
|
||||
"installing FreeBSD from a supported CDROM drive then this is generally\n"
|
||||
"installing FreeBSD from a supported CD/DVD drive then this is generally\n"
|
||||
"the best media to use if you have no overriding reason for using other\n"
|
||||
"media.",
|
||||
"Press F1 for more information on the various media types",
|
||||
"media",
|
||||
{ { "1 CDROM", "Install from a FreeBSD CDROM", NULL, mediaSetCDROM },
|
||||
{ { "1 CD/DVD", "Install from a FreeBSD CD/DVD", NULL, mediaSetCDROM },
|
||||
{ "2 FTP", "Install from an FTP server", NULL, mediaSetFTPActive },
|
||||
{ "3 FTP Passive", "Install from an FTP server through a firewall", NULL, mediaSetFTPPassive },
|
||||
{ "4 HTTP", "Install from an FTP server through a http proxy", NULL, mediaSetHTTP },
|
||||
|
@ -88,7 +88,7 @@ mediaInitCDROM(Device *dev)
|
||||
args.flags = 0;
|
||||
if (mount("cd9660", mountpoint, MNT_RDONLY, (caddr_t) &args) == -1) {
|
||||
if (errno == EINVAL) {
|
||||
msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
|
||||
msgConfirm("The disc in your drive looks more like an Audio disc than a FreeBSD release.");
|
||||
return FALSE;
|
||||
}
|
||||
else if (errno != EBUSY) {
|
||||
@ -99,9 +99,9 @@ mediaInitCDROM(Device *dev)
|
||||
cdromMounted = TRUE;
|
||||
|
||||
if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) {
|
||||
if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
|
||||
"CD or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
|
||||
"have a version number on it. Do you wish to use this CD anyway?") != 0) {
|
||||
if (msgYesNo("Warning: The disc currently in the drive is either not a FreeBSD\n"
|
||||
"disc or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
|
||||
"have a version number on it. Do you wish to use this disc anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
return FALSE;
|
||||
@ -116,7 +116,7 @@ mediaInitCDROM(Device *dev)
|
||||
if (!(cd_attr = read_props(string_concat(mountpoint, "/cdrom.inf")))
|
||||
|| !(cp = property_find(cd_attr, "CD_VERSION"))) {
|
||||
msgConfirm("Unable to find a %s/cdrom.inf file.\n"
|
||||
"Either this is not a FreeBSD CDROM, there is a problem with\n"
|
||||
"Either this is not a FreeBSD disc, there is a problem with\n"
|
||||
"the CDROM driver or something is wrong with your hardware.\n"
|
||||
"Please fix this problem (check the console logs on VTY2) and\n"
|
||||
"try again.", mountpoint);
|
||||
@ -126,15 +126,15 @@ mediaInitCDROM(Device *dev)
|
||||
variable_cmp(VAR_RELNAME, "any") &&
|
||||
variable_cmp(cp, "any") &&
|
||||
!bogusCDOK) {
|
||||
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
|
||||
msgConfirm("Warning: The version of the FreeBSD disc currently in the drive\n"
|
||||
"(%s) does not match the version of the boot floppy\n"
|
||||
"(%s).\n\n"
|
||||
"If this is intentional, to avoid this message in the future\n"
|
||||
"please visit the Options editor to set the boot floppy version\n"
|
||||
"string to match that of the CD before selecting it as your\n"
|
||||
"string to match that of the disc before selecting it as your\n"
|
||||
"installation media.", cp, variable_get(VAR_RELNAME));
|
||||
|
||||
if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
|
||||
if (msgYesNo("Would you like to try and use this disc anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
properties_free(cd_attr);
|
||||
@ -150,10 +150,10 @@ mediaInitCDROM(Device *dev)
|
||||
#else
|
||||
strcmp(cp, "x86")) {
|
||||
#endif
|
||||
msgConfirm("Fatal: The FreeBSD install CD currently in the drive\n"
|
||||
msgConfirm("Fatal: The FreeBSD install CD/DVD currently in the drive\n"
|
||||
"is for the %s architecture, not the machine you're using.\n\n"
|
||||
|
||||
"Please use the correct installation CD for your machine type.", cp);
|
||||
"Please use the correct installation CD/DVD for your machine type.", cp);
|
||||
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
@ -181,7 +181,7 @@ mediaShutdownCDROM(Device *dev)
|
||||
return;
|
||||
|
||||
if (unmount(mountpoint, MNT_FORCE) != 0)
|
||||
msgConfirm("Could not unmount the CDROM from %s: %s", mountpoint, strerror(errno));
|
||||
msgConfirm("Could not unmount the CDROM/DVD from %s: %s", mountpoint, strerror(errno));
|
||||
else
|
||||
cdromMounted = FALSE;
|
||||
}
|
||||
|
@ -394,7 +394,7 @@ distMaybeSetPorts(dialogMenuItem *self)
|
||||
"This will give you ready access to over 4000 ported software packages,\n"
|
||||
"at a cost of around 70MB of disk space when \"clean\" and possibly\n"
|
||||
"much more than that when a lot of the distribution tarballs are loaded\n"
|
||||
"(unless you have the extra CDs available from a FreeBSD CDROM distribution\n"
|
||||
"(unless you have the extra discs available from a FreeBSD CD/DVD distribution\n"
|
||||
"and can mount them on /cdrom, in which case this is far less of a problem).\n\n"
|
||||
"The ports collection is a very valuable resource and well worth having\n"
|
||||
"on your /usr partition, so it is advisable to say Yes to this option.\n\n"
|
||||
|
@ -269,11 +269,11 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
(void)rmdir("/mnt2");
|
||||
|
||||
while (1) {
|
||||
msgConfirm("Please insert a FreeBSD live filesystem CDROM and press return");
|
||||
msgConfirm("Please insert a FreeBSD live filesystem CD/DVD and press return");
|
||||
if (DITEM_STATUS(mediaSetCDROM(NULL)) != DITEM_SUCCESS || !mediaDevice || !mediaDevice->init(mediaDevice)) {
|
||||
/* If we can't initialize it, it's probably not a FreeBSD CDROM so punt on it */
|
||||
mediaClose();
|
||||
if (msgYesNo("Unable to mount the CDROM - do you want to try again?") != 0)
|
||||
if (msgYesNo("Unable to mount the disc - do you want to try again?") != 0)
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
else
|
||||
@ -284,7 +284,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
* a little kludge dance here..
|
||||
*/
|
||||
if (symlink("/dist", "/mnt2")) {
|
||||
msgConfirm("Unable to symlink /mnt2 to the CDROM mount point. Please report this\n"
|
||||
msgConfirm("Unable to symlink /mnt2 to the disc mount point. Please report this\n"
|
||||
"unexpected failure to freebsd-bugs@FreeBSD.org.");
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
@ -307,7 +307,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
Mkdir("/var/run");
|
||||
if (vsystem("/mnt2/sbin/ldconfig -s /mnt2/usr/lib")) {
|
||||
msgConfirm("Warning: ldconfig could not create the ld.so hints file.\n"
|
||||
"Dynamic executables from the CDROM likely won't work.");
|
||||
"Dynamic executables from the disc likely won't work.");
|
||||
}
|
||||
}
|
||||
|
||||
@ -320,7 +320,7 @@ installFixitCDROM(dialogMenuItem *self)
|
||||
if (!file_readable("/usr/libexec/ld-elf.so.1")) {
|
||||
if (symlink("/mnt2/usr/libexec/ld-elf.so.1", "/usr/libexec/ld-elf.so.1")) {
|
||||
msgConfirm("Warning: could not create the symlink for ld-elf.so.1\n"
|
||||
"Dynamic executables from the CDROM likely won't work.");
|
||||
"Dynamic executables from the disc likely won't work.");
|
||||
}
|
||||
}
|
||||
/* optional nicety */
|
||||
|
@ -152,7 +152,7 @@ main(int argc, char **argv)
|
||||
|| !msgNoYes("Are you sure you wish to exit? The system will halt.")
|
||||
#else
|
||||
|| !msgNoYes("Are you sure you wish to exit? The system will reboot\n"
|
||||
"(be sure to remove any floppies/CDROMs from the drives).")
|
||||
"(be sure to remove any floppies/CDs/DVDs from the drives).")
|
||||
#endif
|
||||
)
|
||||
break;
|
||||
|
@ -144,8 +144,8 @@ mediaSetCDROM(dialogMenuItem *self)
|
||||
cnt = deviceCount(devs);
|
||||
if (!cnt) {
|
||||
if (self) /* Interactive? */
|
||||
msgConfirm("No CDROM devices found! Please check that your system's\n"
|
||||
"configuration is correct and that the CDROM drive is of a supported\n"
|
||||
msgConfirm("No CD/DVD devices found! Please check that your system's\n"
|
||||
"configuration is correct and that the CD/DVD drive is of a supported\n"
|
||||
"type. For more information, consult the hardware guide\n"
|
||||
"in the Doc menu.");
|
||||
return DITEM_FAILURE | DITEM_CONTINUE;
|
||||
|
@ -240,7 +240,7 @@ DMenu MenuIndex = {
|
||||
{ " Media, Tape", "Select tape installation media.", NULL, mediaSetTape },
|
||||
{ " Media, NFS", "Select NFS installation media.", NULL, mediaSetNFS },
|
||||
{ " Media, Floppy", "Select floppy installation media.", NULL, mediaSetFloppy },
|
||||
{ " Media, CDROM", "Select CDROM installation media.", NULL, mediaSetCDROM },
|
||||
{ " Media, CDROM/DVD", "Select CDROM/DVD installation media.", NULL, mediaSetCDROM },
|
||||
{ " Media, DOS", "Select DOS installation media.", NULL, mediaSetDOS },
|
||||
{ " Media, UFS", "Select UFS installation media.", NULL, mediaSetUFS },
|
||||
{ " Media, FTP", "Select FTP installation media.", NULL, mediaSetFTP },
|
||||
@ -410,11 +410,11 @@ DMenu MenuMouse = {
|
||||
|
||||
DMenu MenuMediaCDROM = {
|
||||
DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"Choose a CDROM type",
|
||||
"FreeBSD can be installed directly from a CDROM containing a valid\n"
|
||||
"Choose a CD/DVD type",
|
||||
"FreeBSD can be installed directly from a CD/DVD containing a valid\n"
|
||||
"FreeBSD distribution. If you are seeing this menu it is because\n"
|
||||
"more than one CDROM drive was found on your system. Please select one\n"
|
||||
"of the following CDROM drives as your installation drive.",
|
||||
"more than one CD/DVD drive was found on your system. Please select one\n"
|
||||
"of the following CD/DVD drives as your installation drive.",
|
||||
"Press F1 to read the installation guide",
|
||||
"INSTALL",
|
||||
{ { NULL } },
|
||||
@ -692,12 +692,12 @@ DMenu MenuMedia = {
|
||||
"Choose Installation Media",
|
||||
"FreeBSD can be installed from a variety of different installation\n"
|
||||
"media, ranging from floppies to an Internet FTP server. If you're\n"
|
||||
"installing FreeBSD from a supported CDROM drive then this is generally\n"
|
||||
"installing FreeBSD from a supported CD/DVD drive then this is generally\n"
|
||||
"the best media to use if you have no overriding reason for using other\n"
|
||||
"media.",
|
||||
"Press F1 for more information on the various media types",
|
||||
"media",
|
||||
{ { "1 CDROM", "Install from a FreeBSD CDROM", NULL, mediaSetCDROM },
|
||||
{ { "1 CD/DVD", "Install from a FreeBSD CD/DVD", NULL, mediaSetCDROM },
|
||||
{ "2 FTP", "Install from an FTP server", NULL, mediaSetFTPActive },
|
||||
{ "3 FTP Passive", "Install from an FTP server through a firewall", NULL, mediaSetFTPPassive },
|
||||
{ "4 HTTP", "Install from an FTP server through a http proxy", NULL, mediaSetHTTP },
|
||||
|
@ -247,7 +247,7 @@ pccardInitialize(void)
|
||||
msgConfirm("Now we start initializing PC-card controller and cards.\n"
|
||||
"If you've executed this installer from a PC-card floppy\n"
|
||||
"drive, this is the last chance to replace it with\n"
|
||||
"installation media (PC-card Ethernet, CDROM, etc.).\n"
|
||||
"installation media (PC-card Ethernet, CD, DVD, etc.).\n"
|
||||
"Please insert installation media and press [Enter].\n"
|
||||
"If you've not plugged the PC-card installation media\n"
|
||||
"in yet, please plug it in now and press [Enter].\n"
|
||||
|
Loading…
Reference in New Issue
Block a user