From 57bd39c6d6d72012f90065ee4fef5f3a438df599 Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Sun, 14 Nov 2010 13:25:01 +0000 Subject: [PATCH] Fix use of CD_VERSION=any in cdrom.inf by calling strcmp instead of variable_cmp. PR: bin/142960 Submitted by: G. Paul Ziemba MFC after: 1 week --- usr.sbin/sysinstall/cdrom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 6bc72d863ef..42ba1a01a26 100644 --- a/usr.sbin/sysinstall/cdrom.c +++ b/usr.sbin/sysinstall/cdrom.c @@ -145,7 +145,7 @@ mediaInitCDROM(Device *dev) else { if (variable_cmp(VAR_RELNAME, cp) && variable_cmp(VAR_RELNAME, "any") && - variable_cmp(cp, "any") && + strcmp(cp, "any") && !bogusCDOK) { msgConfirm("Warning: The version of the FreeBSD disc currently in the drive\n" "(%s) does not match the version of the boot floppy\n"