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/cdrom.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/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 0b8829d..2eae850 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" |
