Various changes to the messages so that they are now appropriate for both

CD and DVD releases of FreeBSD.

1 files changed, 11 insertions, 11 deletions

diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 2eae850..dca26d7 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -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;
 }