diff options
| author | jkh <jkh@FreeBSD.org> | 1996-10-14 21:50:38 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-10-14 21:50:38 +0000 |
| commit | 4bf196a8f97407efefcc5267e15679dd07dfeb23 (patch) | |
| tree | 0f4b436953ed558dd54b4e0d26e762e4c916ca11 /release | |
| parent | 5a3b6bd7f9e68aefd083df64b62f0197bd180bc3 (diff) | |
| download | FreeBSD-src-4bf196a8f97407efefcc5267e15679dd07dfeb23.zip FreeBSD-src-4bf196a8f97407efefcc5267e15679dd07dfeb23.tar.gz | |
Don't casually blow away FTP site settings now that it's easy for user
to override them.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/media.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index dc642a4..d173da8 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.60 1996/10/09 09:53:38 jkh Exp $ + * $Id: media.c,v 1.61 1996/10/12 19:30:20 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -262,11 +262,11 @@ mediaSetFTP(dialogMenuItem *self) static Boolean network_init = 1; int what = DITEM_RESTORE; + cp = variable_get(VAR_FTP_PATH); /* If we've been through here before ... */ - if (!network_init && msgYesNo("Re-use old FTP site selection values?")) - variable_unset(VAR_FTP_PATH); + if (!network_init && cp && msgYesNo("Re-use old FTP site selection values?")) + cp = NULL; - cp = variable_get(VAR_FTP_PATH); if (!cp) { dialog_clear_norefresh(); if (!dmenuOpenSimple(&MenuMediaFTP, FALSE)) @@ -337,7 +337,6 @@ mediaSetFTP(dialogMenuItem *self) "name server, gateway and network interface are correctly configured?", hostname); mediaDevice->shutdown(mediaDevice); network_init = TRUE; - variable_unset(VAR_FTP_PATH); return DITEM_FAILURE | what; } } |
