diff options
| author | phk <phk@FreeBSD.org> | 1995-05-28 07:05:21 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1995-05-28 07:05:21 +0000 |
| commit | 999c6a51c7078e03e84931e2a6d161131dba9ff1 (patch) | |
| tree | cec8256af67706debb945e68ca58a185e1671691 /usr.sbin/sysinstall/cdrom.c | |
| parent | 1972cc16073779929198e1e5a755921000e62672 (diff) | |
| download | FreeBSD-src-999c6a51c7078e03e84931e2a6d161131dba9ff1.zip FreeBSD-src-999c6a51c7078e03e84931e2a6d161131dba9ff1.tar.gz | |
cdrom.c: try "cdrom/%s" then "cdrom/dists/%s"
dist.c: fix an error message to make more sense.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 86f8afc..63831c0 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.2 1995/05/27 23:39:26 phk Exp $ + * $Id: cdrom.c,v 1.3 1995/05/28 03:04:46 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -105,6 +105,9 @@ mediaGetCDROM(char *file) char buf[PATH_MAX]; snprintf(buf, PATH_MAX, "/cdrom/%s", file); + if (!access(buf,R_OK)) + return open(buf, O_RDONLY); + snprintf(buf, PATH_MAX, "/cdrom/dists/%s", file); return open(buf, O_RDONLY); } |
