diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-07-08 10:08:22 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1996-07-08 10:08:22 +0000 |
| commit | de4342fa4492acf376792f5db66d785c0e1fc78c (patch) | |
| tree | c59eaf720ed2ae72da1988782279e197cc24983a /usr.sbin/sade | |
| parent | cf1647cd2fd785ffdd4872e03dd8836d010af5f2 (diff) | |
| download | src-de4342fa4492acf376792f5db66d785c0e1fc78c.tar.gz src-de4342fa4492acf376792f5db66d785c0e1fc78c.zip | |
Fix even more lurking bogons - why do I never find these until the last
possible minute? :-)
Notes
Notes:
svn path=/head/; revision=17007
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/install.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sade/sade.h | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index b08b90589d0d..7995adac961f 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.108 1996/07/05 08:35:56 jkh Exp $ + * $Id: install.c,v 1.109 1996/07/08 08:54:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -801,8 +801,6 @@ installVarDefaults(dialogMenuItem *self) variable_set2(VAR_BROWSER_PACKAGE, "lynx-2.5FM"); variable_set2(VAR_BROWSER_BINARY, "/usr/local/bin/lynx"); 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"); diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 1cc22addd2df..c785fc3bd9f1 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.71 1996/07/05 08:36:00 jkh Exp $ + * $Id: sysinstall.h,v 1.72 1996/07/08 08:54:33 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -58,7 +58,7 @@ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ #define DEV_MAX 100 /* The maximum number of devices we'll deal with */ #define INTERFACE_MAX 50 /* Maximum number of network interfaces we'll deal with */ -#define MAX_FTP_RETRIES "4" /* How many times to beat our heads against the wall */ +#define IO_ERROR -2 /* Status code for I/O error rather than normal EOF */ /* * I make some pretty gross assumptions about having a max of 50 chunks @@ -90,11 +90,9 @@ #define VAR_EDITOR "editor" #define VAR_EXTRAS "ifconfig_" #define VAR_FTP_DIR "ftpDirectory" -#define VAR_FTP_ONERROR "ftpOnError" #define VAR_FTP_PASS "ftpPass" #define VAR_FTP_PATH "ftp" #define VAR_FTP_PORT "ftpPort" -#define VAR_FTP_RETRIES "ftpRetryCount" #define VAR_FTP_STATE "ftpState" #define VAR_FTP_USER "ftpUser" #define VAR_FTP_HOST "ftpHost" @@ -507,7 +505,6 @@ extern int mediaSetFTPActive(dialogMenuItem *self); extern int mediaSetFTPPassive(dialogMenuItem *self); extern int mediaSetUFS(dialogMenuItem *self); extern int mediaSetNFS(dialogMenuItem *self); -extern int mediaSetFtpOnError(dialogMenuItem *self); extern int mediaSetFtpUserPass(dialogMenuItem *self); extern int mediaSetCPIOVerbosity(dialogMenuItem *self); extern int mediaGetType(dialogMenuItem *self); |