diff options
| author | Paul Traina <pst@FreeBSD.org> | 1996-09-26 22:07:32 +0000 |
|---|---|---|
| committer | Paul Traina <pst@FreeBSD.org> | 1996-09-26 22:07:32 +0000 |
| commit | 41b018dd0ba3cc2e4a272ddb3ca33382c682624c (patch) | |
| tree | b447cfc9c2a7882dfee656b994dce62e476e5bbf | |
| parent | 09bef27f97f8968d7731b3afcfe8d3b8d8b76ff4 (diff) | |
Notes
| -rw-r--r-- | release/sysinstall/media.c | 16 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/media.c | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 6a572ae8513b..d3013db2fc68 100644 --- a/release/sysinstall/media.c +++ b/release/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.51 1996/08/01 12:59:54 jkh Exp $ + * $Id: media.c,v 1.52 1996/08/03 10:11:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -259,12 +259,18 @@ mediaSetFTP(dialogMenuItem *self) static Device ftpDevice; char *cp, *hostname, *dir; extern int FtpPort; + static int first_time = 1; dialog_clear_norefresh(); - if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) - return DITEM_FAILURE | DITEM_RECREATE; - else - cp = variable_get(VAR_FTP_PATH); + cp = variable_get(VAR_FTP_PATH); + if (!(cp && first_time)) { + if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) + return DITEM_FAILURE | DITEM_RECREATE; + else + cp = variable_get(VAR_FTP_PATH); + } + if (first_time) + first_time = 0; if (!cp) { msgConfirm("%s not set! Not setting an FTP installation path, OK?", VAR_FTP_PATH); return DITEM_FAILURE | DITEM_RECREATE; diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index 6a572ae8513b..d3013db2fc68 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.51 1996/08/01 12:59:54 jkh Exp $ + * $Id: media.c,v 1.52 1996/08/03 10:11:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -259,12 +259,18 @@ mediaSetFTP(dialogMenuItem *self) static Device ftpDevice; char *cp, *hostname, *dir; extern int FtpPort; + static int first_time = 1; dialog_clear_norefresh(); - if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) - return DITEM_FAILURE | DITEM_RECREATE; - else - cp = variable_get(VAR_FTP_PATH); + cp = variable_get(VAR_FTP_PATH); + if (!(cp && first_time)) { + if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) + return DITEM_FAILURE | DITEM_RECREATE; + else + cp = variable_get(VAR_FTP_PATH); + } + if (first_time) + first_time = 0; if (!cp) { msgConfirm("%s not set! Not setting an FTP installation path, OK?", VAR_FTP_PATH); return DITEM_FAILURE | DITEM_RECREATE; |