talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Catch more cases where the CDROM has been mounted.

This commit is contained in:
Jordan K. Hubbard 1998-08-27 00:50:14 +00:00
parent 9d9806c5b9
commit 0fc1c5c44a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
release/sysinstall/cdrom.c
View File

@ -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 {

5
usr.sbin/sysinstall/cdrom.c
View File

@ -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 {