summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall
diff options
context:
space:
mode:
authorbrucec <brucec@FreeBSD.org>2010-11-14 13:25:01 +0000
committerbrucec <brucec@FreeBSD.org>2010-11-14 13:25:01 +0000
commit521fec1e8ecddcd8437e230ff52cc8f28994a2c0 (patch)
tree10fe76a1ded5f400c1eb162833af403993df57e0 /usr.sbin/sysinstall
parent47ccecf68d1b7864707f8a7dff2fb8c1a7597703 (diff)
downloadFreeBSD-src-521fec1e8ecddcd8437e230ff52cc8f28994a2c0.zip
FreeBSD-src-521fec1e8ecddcd8437e230ff52cc8f28994a2c0.tar.gz
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
Diffstat (limited to 'usr.sbin/sysinstall')
-rw-r--r--usr.sbin/sysinstall/cdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 6bc72d8..42ba1a0 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"
OpenPOWER on IntegriCloud