d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tweaks to FTP reselection code - allow "none" to stand for

Browse Source 
"no specific release - use anything you can find"
This commit is contained in:
Jordan K. Hubbard 1996-10-02 01:30:37 +00:00
parent a1d6d1bcd5
commit 899469e32a
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
release/sysinstall/ftp_strat.c
View File

@ -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: ftp_strat.c,v 1.22 1996/07/09 14:28:14 jkh Exp $
* $Id: ftp_strat.c,v 1.23 1996/10/02 00:41:39 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -108,21 +108,19 @@ mediaInitFTP(Device *dev)
}
/* Give it a shot - can't hurt to try and zoom in if we can, unless the release is set to
__RELEASE which signifies that it's not set */
__RELEASE or "none" which signifies that it's not set */
rel = variable_get(VAR_RELNAME);
if (strcmp(rel, "__RELEASE"))
if (strcmp(rel, "__RELEASE") && strcmp(rel, "none"))
i = FtpChdir(ftp, rel);
else
i = 0;
if (i == -1) {
if (!msgYesNo("Warning: Can't CD to `%s' distribution on this\n"
"FTP server. You may need to visit a different\n"
"server for the release you're trying to fetch\n"
"or go to the Options menu and to set the release\n"
"name to explicitly match what's available on\n"
"%s.\n\n"
"Would you like to select another FTP server?",
rel, hostname)) {
"FTP server. You may need to visit a different server for\n"
"the release you're trying to fetch or go to the Options\n"
"menu and to set the release name to explicitly match what's\n"
"available on %s.\n\n"
"Would you like to select another FTP server?", rel, hostname)) {
dialog_clear_norefresh();
variable_unset(VAR_FTP_PATH);
if (!dmenuOpenSimple(&MenuMediaFTP, FALSE))

4
release/sysinstall/options.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: options.c,v 1.42 1996/08/03 10:11:33 jkh Exp $
* $Id: options.c,v 1.43 1996/10/01 12:13:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -94,7 +94,7 @@ mediaCheck(Option opt)
}
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
#define RELNAME_PROMPT "Please specify the release you wish to load:"
#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
#define BPKG_PROMPT "Please specify the name of the HTML browser package:"
#define BBIN_PROMPT "Please specify a full pathname to the HTML browser binary:"
#define EDITOR_PROMPT "Please specify the name of the text editor you wish to use:"

4
usr.sbin/sysinstall/options.c
View File

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
* $Id: options.c,v 1.42 1996/08/03 10:11:33 jkh Exp $
* $Id: options.c,v 1.43 1996/10/01 12:13:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -94,7 +94,7 @@ mediaCheck(Option opt)
}
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
#define RELNAME_PROMPT "Please specify the release you wish to load:"
#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
#define BPKG_PROMPT "Please specify the name of the HTML browser package:"
#define BBIN_PROMPT "Please specify a full pathname to the HTML browser binary:"
#define EDITOR_PROMPT "Please specify the name of the text editor you wish to use:"