diff options
author | jkh <jkh@FreeBSD.org> | 2000-09-22 08:13:36 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 2000-09-22 08:13:36 +0000 |
commit | edd9684293116b28ea797ca70402dd50a730ed28 (patch) | |
tree | 1783cbe1fbe7e1a54ed1320eb20e598c2823591b /usr.sbin/sysinstall/ftp.c | |
parent | 8b0722360737b693b543b5d78f32ba18fad4777d (diff) | |
download | FreeBSD-src-edd9684293116b28ea797ca70402dd50a730ed28.zip FreeBSD-src-edd9684293116b28ea797ca70402dd50a730ed28.tar.gz |
Remove the bogus check against "none" for release names (which
really doesn't make any sense, what was I smoking) and allow
the more canonical usage of "any" for either side of the comparison
for release name or architecture (meaning you can also set CD_VERSION=any
in a cdrom.inf file to cause sysinstall to always match it and likewise
with the architecture, if specified).
Sensibly suggested by: Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
Diffstat (limited to 'usr.sbin/sysinstall/ftp.c')
-rw-r--r-- | usr.sbin/sysinstall/ftp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c index b9cb0dc..ef602d5 100644 --- a/usr.sbin/sysinstall/ftp.c +++ b/usr.sbin/sysinstall/ftp.c @@ -149,11 +149,11 @@ try: /* * Now that we've verified that the path we're given is ok, let's try to * be a bit intelligent in locating the release we are looking for. First - * off, if the release is specified as "__RELEASE" or "none", then just + * off, if the release is specified as "__RELEASE" or "any", then just * assume that the current directory is the one we want and give up. */ rel = variable_get(VAR_RELNAME); - if (strcmp(rel, "__RELEASE") && strcmp(rel, "none")) { + if (strcmp(rel, "__RELEASE") && strcmp(rel, "any")) { /* * Ok, since we have a release variable, let's walk through the list * of directories looking for a release directory. The first one to @@ -182,7 +182,7 @@ try: "FTP server. You may need to visit a different server for\n" "the release you are 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 (or set to \"none\").\n\n" + "available on %s (or set to \"any\").\n\n" "Would you like to select another FTP server?", rel, hostname)) { variable_unset(VAR_FTP_PATH); |