diff options
| author | jkh <jkh@FreeBSD.org> | 1998-08-27 00:50:14 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-08-27 00:50:14 +0000 |
| commit | 8fcd4bbef1790c0ef594e4304577979f53e36122 (patch) | |
| tree | cce9bdcd5b9dc758296fd7b77133d3cb240d6785 | |
| parent | 25fd175f461b7483dbd86d882814a6e81d7539c2 (diff) | |
| download | FreeBSD-src-8fcd4bbef1790c0ef594e4304577979f53e36122.zip FreeBSD-src-8fcd4bbef1790c0ef594e4304577979f53e36122.tar.gz | |
Catch more cases where the CDROM has been mounted.
| -rw-r--r-- | release/sysinstall/cdrom.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c index 498ff9a..460d815 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.40 1998/01/16 15:07:54 jkh Exp $ + * $Id: cdrom.c,v 1.41 1998/07/21 06:44:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -86,12 +86,15 @@ mediaInitCDROM(Device *dev) } cdromMounted = TRUE; } + else + 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) { unmount(mountpoint, MNT_FORCE); + cdromMounted = FALSE; return FALSE; } else { diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 498ff9a..460d815 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.40 1998/01/16 15:07:54 jkh Exp $ + * $Id: cdrom.c,v 1.41 1998/07/21 06:44:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -86,12 +86,15 @@ mediaInitCDROM(Device *dev) } cdromMounted = TRUE; } + else + 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) { unmount(mountpoint, MNT_FORCE); + cdromMounted = FALSE; return FALSE; } else { |
