From 78c0bf7c350d8b31a8abab4824d6737c7e08e08c Mon Sep 17 00:00:00 2001 From: jkh Date: Wed, 10 Mar 1999 21:59:01 +0000 Subject: [PATCH] Also look under FREEBSD/.. for distribution files; I meant to do this for the DOS distro. --- release/sysinstall/media.c | 5 ++++- usr.sbin/sysinstall/media.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 7384b41c9ec4..10bda7cc156c 100644 --- a/release/sysinstall/media.c +++ b/release/sysinstall/media.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: media.c,v 1.95 1999/02/05 22:15:50 jkh Exp $ + * $Id: media.c,v 1.96 1999/02/15 00:49:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -772,6 +772,9 @@ mediaGenericGet(char *base, const char *file) char buf[PATH_MAX]; snprintf(buf, PATH_MAX, "%s/%s", base, file); + if (file_readable(buf)) + return fopen(buf, "r"); + snprintf(buf, PATH_MAX, "%s/FreeBSD/%s", base, file); if (file_readable(buf)) return fopen(buf, "r"); snprintf(buf, PATH_MAX, "%s/releases/%s", base, file); diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index 7384b41c9ec4..10bda7cc156c 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/sysinstall/media.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: media.c,v 1.95 1999/02/05 22:15:50 jkh Exp $ + * $Id: media.c,v 1.96 1999/02/15 00:49:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -772,6 +772,9 @@ mediaGenericGet(char *base, const char *file) char buf[PATH_MAX]; snprintf(buf, PATH_MAX, "%s/%s", base, file); + if (file_readable(buf)) + return fopen(buf, "r"); + snprintf(buf, PATH_MAX, "%s/FreeBSD/%s", base, file); if (file_readable(buf)) return fopen(buf, "r"); snprintf(buf, PATH_MAX, "%s/releases/%s", base, file);