diff options
author | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
---|---|---|
committer | Rodney W. Grimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
commit | d3628763db3974826e46a036aa54333147fbe238 (patch) | |
tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /usr.sbin/sysinstall/cdrom.c | |
parent | 67eb1e0ed1fb11c703392e562440c67d3b44b094 (diff) | |
download | src-d3628763db3974826e46a036aa54333147fbe238.tar.gz src-d3628763db3974826e46a036aa54333147fbe238.zip |
Merge RELENG_2_0_5 into HEAD
Notes
Notes:
svn path=/head/; revision=9202
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
-rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index dbb5fb885d1d..0a650976da41 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.5 1995/05/29 11:01:03 jkh Exp $ + * $Id: cdrom.c,v 1.6.2.3 1995/06/05 12:03:44 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -101,13 +101,13 @@ mediaInitCDROM(Device *dev) } int -mediaGetCDROM(char *file) +mediaGetCDROM(Device *dev, char *file, Attribs *dist_attrs) { char buf[PATH_MAX]; snprintf(buf, PATH_MAX, "/cdrom/%s", file); if (!access(buf,R_OK)) - return open(buf, O_RDONLY); + return open(buf, O_RDONLY); snprintf(buf, PATH_MAX, "/cdrom/dists/%s", file); return open(buf, O_RDONLY); } @@ -118,7 +118,7 @@ mediaShutdownCDROM(Device *dev) if (!cdromMounted) return; msgDebug("Unmounting /cdrom\n"); - if (unmount("/cdrom", 0) != 0) + if (unmount("/cdrom", MNT_FORCE) != 0) msgConfirm("Could not unmount the CDROM: %s\n", strerror(errno)); msgDebug("Unmount returned\n"); cdromMounted = FALSE; |