diff options
author | jkh <jkh@FreeBSD.org> | 1996-03-18 15:28:10 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1996-03-18 15:28:10 +0000 |
commit | 6e8165c16a87270a576fb00bc626ad6c02849c41 (patch) | |
tree | bbbb1da098bedb9748f8fa6faa46c10cb2c30d4a /usr.sbin/sysinstall/media.c | |
parent | e938ba728f7b191c0b62d04b1b01689391c2751a (diff) | |
download | FreeBSD-src-6e8165c16a87270a576fb00bc626ad6c02849c41.zip FreeBSD-src-6e8165c16a87270a576fb00bc626ad6c02849c41.tar.gz |
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.
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
-rw-r--r-- | usr.sbin/sysinstall/media.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index d502c1e..6c77800 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.26 1995/09/18 16:52:31 peter Exp $ + * $Id: media.c,v 1.27 1995/12/07 10:34:00 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -92,7 +92,7 @@ mediaSetCDROM(char *str) Device **devs; int cnt; - if (!RunningAsInit) { + if (!file_readable("/cdrom/kernel")) { vsystem("mount /cdrom"); if (!file_readable("/cdrom/kernel")) { msgConfirm("Can't find a FreeBSD CD in /cdrom?"); |