summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/cdrom.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-07-13 05:48:44 +0000
committerjkh <jkh@FreeBSD.org>1996-07-13 05:48:44 +0000
commit4d9a926a370ee497b15899172d5d4e840560c859 (patch)
tree49799f6be51283f1d47db3da532fa52fd61d7210 /usr.sbin/sysinstall/cdrom.c
parent56fd5c89a1f52e5a5151ca82a5e1bc670fbe9af2 (diff)
downloadFreeBSD-src-4d9a926a370ee497b15899172d5d4e840560c859.zip
FreeBSD-src-4d9a926a370ee497b15899172d5d4e840560c859.tar.gz
Make CD version clash non-fatal.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
-rw-r--r--usr.sbin/sysinstall/cdrom.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 5d0c7dd..ee56aed 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: cdrom.c,v 1.18 1996/07/12 11:13:54 jkh Exp $
+ * $Id: cdrom.c,v 1.19 1996/07/13 05:09:28 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -113,13 +113,11 @@ mediaInitCDROM(Device *dev)
"Please fix this problem (check the console logs on VTY2) and\n"
"try again.");
else
- msgConfirm("The version of the FreeBSD CD currently in the drive (%s)\n"
+ msgConfirm("Warning: The version of the FreeBSD CD currently in the drive (%s)\n"
"does not match the version of this boot floppy (%s).\n"
"If this is intentional, then please visit the Options editor\n"
"to set the boot floppy version string to match that of the CD\n"
- "before selecting it as an installation media.", cp, variable_get(VAR_RELNAME));
- cdromMounted = CD_UNMOUNTED;
- return FALSE;
+ "before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));
}
msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname);
return TRUE;
OpenPOWER on IntegriCloud