summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/cdrom.c
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-12-12 16:55:37 +0000
committerjkh <jkh@FreeBSD.org>1996-12-12 16:55:37 +0000
commitc69e47ec94a9494ada0519b5453daf5374b8412d (patch)
tree4c4485850fa8ca9969bc0e5c8f471cf537870dd1 /usr.sbin/sysinstall/cdrom.c
parente9d9f1a03faaebd237b178bafd1984ebdb7f10ce (diff)
downloadFreeBSD-src-c69e47ec94a9494ada0519b5453daf5374b8412d.zip
FreeBSD-src-c69e47ec94a9494ada0519b5453daf5374b8412d.tar.gz
smart-alec error checking.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
-rw-r--r--usr.sbin/sysinstall/cdrom.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 69b415b..6ab57c2 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.28 1996/12/11 18:23:16 jkh Exp $
+ * $Id: cdrom.c,v 1.29 1996/12/12 08:33:35 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -81,8 +81,14 @@ mediaInitCDROM(Device *dev)
if (!file_readable("/cdrom/cdrom.inf")) {
Mkdir("/cdrom");
if (mount(MOUNT_CD9660, "/cdrom", MNT_RDONLY, (caddr_t) &args) == -1) {
- if (errno != EBUSY) {
+ if (errno == EINVAL) {
+ msgConfirm("The CD in your drive looks more like an Audio CD than a FreeBSD release.");
+ cdromMounted = CD_UNMOUNTED;
+ return FALSE;
+ }
+ else if (errno != EBUSY) {
msgConfirm("Error mounting %s on /cdrom: %s (%u)", dev->devname, strerror(errno), errno);
+ cdromMounted = CD_UNMOUNTED;
return FALSE;
}
}
OpenPOWER on IntegriCloud