From 6e8165c16a87270a576fb00bc626ad6c02849c41 Mon Sep 17 00:00:00 2001 From: jkh Date: Mon, 18 Mar 1996 15:28:10 +0000 Subject: Lots of fixes: 1. Revamp package installer to use new dependency lists and also pkg_add's new `read from stdin' mode to prevent a copy of the package from hitting the disk unnecessarily. 2. More fixes for running "not as init" - don't get upset if CDROM already mounted, do the right thing instead. 3. If running as init, assume first-time install and _don't show the (W)rite option in the fdisk screen. 4. Many other little tweaks, some of which will have to wait for fuller testing until I can create a boot floppy (testing certain system-destroying features of sysinstall can be a royal pain). Expect some more commits. --- usr.sbin/sysinstall/config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.sbin/sysinstall/config.c') diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index e49b574..8b90941 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.17 1995/09/18 16:52:22 peter Exp $ + * $Id: config.c,v 1.18 1995/12/07 10:33:35 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -455,7 +455,7 @@ configPackages(char *str) if (ret == RET_DONE) break; else if (ret != RET_FAIL) { - index_extract(mediaDevice, &plist); + index_extract(mediaDevice, &top, &plist); break; } } @@ -477,7 +477,7 @@ configPorts(char *str) if (!variable_get(VAR_PORTS_PATH)) variable_set2(VAR_PORTS_PATH, dist = "/cdrom/ports"); - while (!directoryExists(dist)) { + while (!directory_exists(dist)) { dist = variable_get_value(VAR_PORTS_PATH, "Unable to locate a ports tree on CDROM. Please specify the\n" "location of the master ports directory you wish to create the\n" -- cgit v1.1