diff options
| author | jkh <jkh@FreeBSD.org> | 1995-05-22 14:10:25 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1995-05-22 14:10:25 +0000 |
| commit | 102ea06d3bd47d7b7dcdaa9f1121ba3e26b1a3e7 (patch) | |
| tree | 9229dd261cca0b9bdfdd8d28254004226a5b7505 /usr.sbin/sysinstall/msg.c | |
| parent | a93f9fc13537d35520b293f7dda9f8361a782400 (diff) | |
| download | FreeBSD-src-102ea06d3bd47d7b7dcdaa9f1121ba3e26b1a3e7.zip FreeBSD-src-102ea06d3bd47d7b7dcdaa9f1121ba3e26b1a3e7.tar.gz | |
Implement most of the CD extract code.
Clean up a few last display bugs.
Add sanity checking that makes sure user creates root and swap partitions.
Add swap partitions with swapon().
Diffstat (limited to 'usr.sbin/sysinstall/msg.c')
| -rw-r--r-- | usr.sbin/sysinstall/msg.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c index c9b3e20..c78621d 100644 --- a/usr.sbin/sysinstall/msg.c +++ b/usr.sbin/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: msg.c,v 1.20 1995/05/20 14:05:31 jkh Exp $ + * $Id: msg.c,v 1.21 1995/05/20 19:12:12 phk Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -44,6 +44,9 @@ #include "sysinstall.h" #include <stdarg.h> +#define VTY_STATLINE 24 +#define TTY_STATLINE 23 + /* Whack up an informational message on the status line, in stand-out */ void msgYap(char *fmt, ...) @@ -58,7 +61,7 @@ msgYap(char *fmt, ...) va_end(args); attrs = getattrs(stdscr); attrset(A_REVERSE); - mvaddstr(23, 0, errstr); + mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); free(errstr); @@ -74,7 +77,7 @@ msgInfo(char *fmt, ...) /* NULL is a special convention meaning "erase the old stuff" */ if (!fmt) { - move(23, 0); + move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0); clrtoeol(); return; } @@ -84,7 +87,7 @@ msgInfo(char *fmt, ...) va_end(args); attrs = getattrs(stdscr); attrset(A_NORMAL); - mvaddstr(23, 0, errstr); + mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); if (OnVTY) { @@ -110,7 +113,7 @@ msgWarn(char *fmt, ...) attrs = getattrs(stdscr); beep(); attrset(A_REVERSE); - mvaddstr(23, 0, errstr); + mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); if (OnVTY) @@ -134,7 +137,7 @@ msgError(char *fmt, ...) beep(); attrs = getattrs(stdscr); attrset(A_REVERSE); - mvaddstr(23, 0, errstr); + mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); if (OnVTY) @@ -158,7 +161,7 @@ msgFatal(char *fmt, ...) beep(); attrs = getattrs(stdscr); attrset(A_REVERSE); - mvaddstr(23, 0, errstr); + mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); addstr(" - "); addstr("PRESS ANY KEY TO "); if (getpid() == 1) |
