From owner-svn-src-all@FreeBSD.ORG  Sun Nov 14 13:25:02 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EBFA61065673;
	Sun, 14 Nov 2010 13:25:01 +0000 (UTC)
	(envelope-from brucec@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D56A58FC0C;
	Sun, 14 Nov 2010 13:25:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAEDP1ka083066;
	Sun, 14 Nov 2010 13:25:01 GMT (envelope-from brucec@svn.freebsd.org)
Received: (from brucec@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAEDP1WC083064;
	Sun, 14 Nov 2010 13:25:01 GMT (envelope-from brucec@svn.freebsd.org)
Message-Id: <201011141325.oAEDP1WC083064@svn.freebsd.org>
From: Bruce Cran <brucec@FreeBSD.org>
Date: Sun, 14 Nov 2010 13:25:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215296 - head/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Nov 2010 13:25:02 -0000

Author: brucec
Date: Sun Nov 14 13:25:01 2010
New Revision: 215296
URL: http://svn.freebsd.org/changeset/base/215296

Log:
  Fix use of CD_VERSION=any in cdrom.inf by calling strcmp instead of
  variable_cmp.
  
  PR:	bin/142960
  Submitted by:	G. Paul Ziemba <p-fbsd-bugs at ziemba.us>
  MFC after:	1 week

Modified:
  head/usr.sbin/sysinstall/cdrom.c

Modified: head/usr.sbin/sysinstall/cdrom.c
==============================================================================
--- head/usr.sbin/sysinstall/cdrom.c	Sun Nov 14 13:09:32 2010	(r215295)
+++ head/usr.sbin/sysinstall/cdrom.c	Sun Nov 14 13:25:01 2010	(r215296)
@@ -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"