diff options
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/install.c | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/msg.c | 10 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 11 |
3 files changed, 14 insertions, 10 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index a55fe6a9f327..17e2442d89f2 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: install.c,v 1.100 1996/06/12 14:02:09 jkh Exp $ + * $Id: install.c,v 1.101 1996/06/13 17:36:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -803,6 +803,7 @@ installVarDefaults(dialogMenuItem *self) variable_set2(VAR_FTP_STATE, "passive"); variable_set2(VAR_FTP_ONERROR, "abort"); variable_set2(VAR_FTP_RETRIES, MAX_FTP_RETRIES); + variable_set2(VAR_PKG_TMPDIR, "/usr/tmp"); if (getpid() != 1) variable_set2(SYSTEM_STATE, "update"); else diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c index 4d25758e16c4..fe40ce6879e5 100644 --- a/usr.sbin/sade/msg.c +++ b/usr.sbin/sade/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.34 1996/05/23 16:34:28 jkh Exp $ + * $Id: msg.c,v 1.35 1996/06/08 09:08:43 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -99,7 +99,7 @@ msgInfo(char *fmt, ...) break; } line[80] = '\0'; - attrset(title_attr); + attrset(ATTR_TITLE); mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, line); attrset(attrs); move(OnVTY ? VTY_STATLINE : TTY_STATLINE, 79); @@ -121,7 +121,7 @@ msgWarn(char *fmt, ...) va_end(args); attrs = getattrs(stdscr); beep(); - attrset(title_attr); + attrset(ATTR_TITLE); mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); @@ -144,7 +144,7 @@ msgError(char *fmt, ...) va_end(args); beep(); attrs = getattrs(stdscr); - attrset(title_attr); + attrset(ATTR_TITLE); mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); attrset(attrs); refresh(); @@ -167,7 +167,7 @@ msgFatal(char *fmt, ...) va_end(args); beep(); attrs = getattrs(stdscr); - attrset(title_attr); + attrset(ATTR_TITLE); mvaddstr(OnVTY ? VTY_STATLINE : TTY_STATLINE, 0, errstr); addstr(" - "); addstr("PRESS ANY KEY TO "); diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index b7733f8bd354..fc8463a38d5a 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -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: sysinstall.h,v 1.59 1996/06/11 09:47:30 jkh Exp $ + * $Id: sysinstall.h,v 1.60 1996/06/12 14:20:20 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -97,6 +97,7 @@ #define VAR_FTP_RETRIES "ftpRetryCount" #define VAR_FTP_STATE "ftpState" #define VAR_FTP_USER "ftpUser" +#define VAR_GATED "gated" #define VAR_GATEWAY "defaultrouter" #define VAR_GEOMETRY "geometry" #define VAR_HOSTNAME "hostname" @@ -113,19 +114,19 @@ #define VAR_NFS_SERVER "nfs_server" #define VAR_NO_CONFIRM "noConfirm" #define VAR_NTPDATE "ntpDate" +#define VAR_PCNFSD "pcnfsd" +#define VAR_PKG_TMPDIR "PKG_TMPDIR" #define VAR_PORTS_PATH "ports" #define VAR_RELNAME "releaseName" #define VAR_ROOT_SIZE "rootSize" #define VAR_ROUTEDFLAGS "routedflags" -#define VAR_GATED "gated" -#define VAR_PCNFSD "pcnfsd" +#define VAR_SERIAL_SPEED "serialSpeed" #define VAR_SLOW_ETHER "slowEthernetCard" #define VAR_SWAP_SIZE "swapSize" #define VAR_TAPE_BLOCKSIZE "tapeBlocksize" #define VAR_UFS_PATH "ufs" #define VAR_USR_SIZE "usrSize" #define VAR_VAR_SIZE "varSize" -#define VAR_SERIAL_SPEED "serialSpeed" #define DEFAULT_TAPE_BLOCKSIZE "20" @@ -134,6 +135,8 @@ /* Which selection attributes to use */ #define ATTR_SELECTED (ColorDisplay ? item_selected_attr : item_attr) +#define ATTR_TITLE button_active_attr + /*** Types ***/ typedef unsigned int Boolean; |