summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/cdrom.c12
-rw-r--r--release/sysinstall/ftp.c6
-rw-r--r--release/sysinstall/options.c2
-rw-r--r--usr.sbin/sysinstall/cdrom.c12
-rw-r--r--usr.sbin/sysinstall/ftp.c6
-rw-r--r--usr.sbin/sysinstall/options.c2
6 files changed, 22 insertions, 18 deletions
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 0b8829dc5497..2eae850925fc 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.c
@@ -122,9 +122,10 @@ mediaInitCDROM(Device *dev)
"try again.", mountpoint);
}
else {
- if (variable_cmp(VAR_RELNAME, cp)
- && variable_cmp(VAR_RELNAME, "none")
- && variable_cmp(VAR_RELNAME, "any") && !bogusCDOK) {
+ if (variable_cmp(VAR_RELNAME, cp) &&
+ variable_cmp(VAR_RELNAME, "any") &&
+ variable_cmp(cp, "any") &&
+ !bogusCDOK) {
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
"(%s) does not match the version of the boot floppy\n"
"(%s).\n\n"
@@ -143,10 +144,11 @@ mediaInitCDROM(Device *dev)
bogusCDOK = TRUE;
}
if ((cp = property_find(cd_attr, "CD_MACHINE_ARCH")) != NULL) {
+ if (strcmp(cp, "any") &&
#ifdef __alpha__
- if (strcmp(cp, "alpha")) {
+ strcmp(cp, "alpha")) {
#else
- if (strcmp(cp, "x86")) {
+ strcmp(cp, "x86")) {
#endif
msgConfirm("Fatal: The FreeBSD install CD currently in the drive\n"
"is for the %s architecture, not the machine you're using.\n\n"
diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c
index b9cb0dc2d3cc..ef602d56225c 100644
--- a/release/sysinstall/ftp.c
+++ b/release/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);
diff --git a/release/sysinstall/options.c b/release/sysinstall/options.c
index ae640f66fe57..0be8ff717543 100644
--- a/release/sysinstall/options.c
+++ b/release/sysinstall/options.c
@@ -97,7 +97,7 @@ mediaCheck(Option opt)
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
#define NEWFS_PROMPT "Please enter newfs(8) parameters:"
-#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
+#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"any\" 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:"
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 0b8829dc5497..2eae850925fc 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -122,9 +122,10 @@ mediaInitCDROM(Device *dev)
"try again.", mountpoint);
}
else {
- if (variable_cmp(VAR_RELNAME, cp)
- && variable_cmp(VAR_RELNAME, "none")
- && variable_cmp(VAR_RELNAME, "any") && !bogusCDOK) {
+ if (variable_cmp(VAR_RELNAME, cp) &&
+ variable_cmp(VAR_RELNAME, "any") &&
+ variable_cmp(cp, "any") &&
+ !bogusCDOK) {
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
"(%s) does not match the version of the boot floppy\n"
"(%s).\n\n"
@@ -143,10 +144,11 @@ mediaInitCDROM(Device *dev)
bogusCDOK = TRUE;
}
if ((cp = property_find(cd_attr, "CD_MACHINE_ARCH")) != NULL) {
+ if (strcmp(cp, "any") &&
#ifdef __alpha__
- if (strcmp(cp, "alpha")) {
+ strcmp(cp, "alpha")) {
#else
- if (strcmp(cp, "x86")) {
+ strcmp(cp, "x86")) {
#endif
msgConfirm("Fatal: The FreeBSD install CD currently in the drive\n"
"is for the %s architecture, not the machine you're using.\n\n"
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c
index b9cb0dc2d3cc..ef602d56225c 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);
diff --git a/usr.sbin/sysinstall/options.c b/usr.sbin/sysinstall/options.c
index ae640f66fe57..0be8ff717543 100644
--- a/usr.sbin/sysinstall/options.c
+++ b/usr.sbin/sysinstall/options.c
@@ -97,7 +97,7 @@ mediaCheck(Option opt)
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
#define NEWFS_PROMPT "Please enter newfs(8) parameters:"
-#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
+#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"any\" 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:"
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 01:28:37 +0000