From owner-cvs-all@FreeBSD.ORG Thu Oct 27 17:13:23 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BA6A16A420; Thu, 27 Oct 2005 17:13:23 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C59943D45; Thu, 27 Oct 2005 17:13:23 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9RHDNXK013083; Thu, 27 Oct 2005 17:13:23 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9RHDNTo013082; Thu, 27 Oct 2005 17:13:23 GMT (envelope-from jhb) Message-Id: <200510271713.j9RHDNTo013082@repoman.freebsd.org> From: John Baldwin Date: Thu, 27 Oct 2005 17:13:23 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/usr.sbin/config config.h config.y main.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2005 17:13:23 -0000 jhb 2005-10-27 17:13:23 UTC FreeBSD src repository Modified files: usr.sbin/config config.h config.y main.c Log: Optionally include a DEFAULTS config file if it is present in the current directory before the specified config file. This is implemented by opening DEFAULTS as stdin if it exists, and if so resetting stdin to the actual config file when DEFAULTS is fully parsed via yywrap(). In short, this lets us create DEFAULTS kernel configs in /sys//conf that can enable certain options or devices by default and allow users to disable them via 'nooptions' or 'nodevice' rather than having to create kludge NO_FOO options. Requested by: scottl Reviewed by: scottl Revision Changes Path 1.57 +1 -0 src/usr.sbin/config/config.h 1.67 +16 -0 src/usr.sbin/config/config.y 1.67 +10 -3 src/usr.sbin/config/main.c