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/disks.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/disks.c')
-rw-r--r-- | usr.sbin/sysinstall/disks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 8b9096c..94e9999 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: disks.c,v 1.34 1995/12/11 16:32:31 jkh Exp $ + * $Id: disks.c,v 1.35 1996/01/23 21:05:22 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -126,7 +126,9 @@ print_command_summary() mvprintw(14, 0, "The following commands are supported (in upper or lower case):"); mvprintw(16, 0, "A = Use Entire Disk B = Bad Block Scan C = Create Partition"); mvprintw(17, 0, "D = Delete Partition G = Set Drive Geometry S = Set Bootable"); - mvprintw(18, 0, "U = Undo All Changes Q = Finish W = Write Changes"); + mvprintw(18, 0, "U = Undo All Changes Q = Finish"); + if (!RunningAsInit) + mvprintw(18, 48, "W = Write Changes"); mvprintw(20, 0, "The currently selected partition is displayed in "); attrset(A_REVERSE); addstr("reverse"); attrset(A_NORMAL); addstr(" video."); mvprintw(21, 0, "Use F1 or ? to get more help, arrow keys to move."); |