diff options
author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-03-18 15:28:10 +0000 |
---|---|---|
committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-03-18 15:28:10 +0000 |
commit | 40ae4689df125baf0fdf2894e11e1037a4136f40 (patch) | |
tree | bbbb1da098bedb9748f8fa6faa46c10cb2c30d4a /usr.sbin/sysinstall/config.c | |
parent | 198c323e44f1d23aacd7d28f28b6b9af3b4d3300 (diff) | |
download | src-40ae4689df125baf0fdf2894e11e1037a4136f40.tar.gz src-40ae4689df125baf0fdf2894e11e1037a4136f40.zip |
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.
Notes
Notes:
svn path=/head/; revision=14670
Diffstat (limited to 'usr.sbin/sysinstall/config.c')
-rw-r--r-- | usr.sbin/sysinstall/config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index e49b574c2637..8b90941eea4a 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" |