diff options
| -rw-r--r-- | release/sysinstall/cdrom.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 10 |
2 files changed, 16 insertions, 4 deletions
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 69b415bd83d2..6ab57c2ab7b2 100644 --- a/release/sysinstall/cdrom.c +++ b/release/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; } } diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 69b415bd83d2..6ab57c2ab7b2 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; } } |