From owner-svn-src-all@FreeBSD.ORG  Sun Aug 15 08:44:33 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 0C7241065696;
	Sun, 15 Aug 2010 08:44:33 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F06628FC12;
	Sun, 15 Aug 2010 08:44:32 +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 o7F8iWtR052954;
	Sun, 15 Aug 2010 08:44:32 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7F8iWsB052952;
	Sun, 15 Aug 2010 08:44:32 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201008150844.o7F8iWsB052952@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sun, 15 Aug 2010 08:44:32 +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: r211325 - head/usr.sbin/config
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, 15 Aug 2010 08:44:33 -0000

Author: imp
Date: Sun Aug 15 08:44:32 2010
New Revision: 211325
URL: http://svn.freebsd.org/changeset/base/211325

Log:
  Turns out that it is a bad idea to have a missing compat option be a
  fatal condition.  While it works out really well for diagnosing the
  case where you want it, but don't have it, it works really badly for
  the case where you don't have it and don't want it.  Remove the printf
  and exit pair.  Replate it with simple return to silently ignore this
  condition.
  
  This is needed to fix the COMPAT_IA32 being required in options.* in
  stable, but we need to run this change through -current first...
  
  MFC after:	3 days

Modified:
  head/usr.sbin/config/mkoptions.c

Modified: head/usr.sbin/config/mkoptions.c
==============================================================================
--- head/usr.sbin/config/mkoptions.c	Sun Aug 15 08:38:48 2010	(r211324)
+++ head/usr.sbin/config/mkoptions.c	Sun Aug 15 08:44:32 2010	(r211325)
@@ -351,9 +351,11 @@ update_option(const char *this, char *va
 			return;
 		}
 	}
-	fprintf(stderr, "Compat option %s not listed in options file.\n",
-	    this);
-	exit(1);
+	/*
+	 * Option not found, but that's OK, we just ignore it since it
+	 * may be for another arch.
+	 */
+	return;
 }
 
 static int