diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1995-05-28 07:05:21 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1995-05-28 07:05:21 +0000 |
| commit | e9f7e74946f2220a8c1010e822807bb3ac73f91b (patch) | |
| tree | cec8256af67706debb945e68ca58a185e1671691 /usr.sbin/sysinstall | |
| parent | 3df0e2af6357d26b081c26524f12ed7793481375 (diff) | |
Notes
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 5 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 86f8afc0c278e..63831c0a8d091 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); } diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index f1e0cae87ef8b..a33e9a690a250 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.27 1995/05/27 23:39:27 phk Exp $ + * $Id: dist.c,v 1.28 1995/05/28 03:04:49 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -303,7 +303,7 @@ distExtract(char *parent, Distribution *me) snprintf(buf, 512, "%s%s.%c%c", path, dist, (chunk / 26) + 'a', (chunk % 26) + 'a'); fd = (*mediaDevice->get)(buf); if (fd < 0) { - msgConfirm("FtpGet failed to retreive piece `%s' in the %s distribution!\nAborting the transfer", chunk, dist); + msgConfirm("failed to retreive piece file %s!\nAborting the transfer", buf); goto punt; } while ((n = read(fd, buf, sizeof buf)) > 0) { |