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"
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to