From owner-freebsd-bugs@FreeBSD.ORG Fri Jun 25 10:01:09 2004 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 355E316A4CE for ; Fri, 25 Jun 2004 10:01:09 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 16C8543D48 for ; Fri, 25 Jun 2004 10:01:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.11/8.12.11) with ESMTP id i5PA0l84036209 for ; Fri, 25 Jun 2004 10:00:47 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i5PA0lZk036208; Fri, 25 Jun 2004 10:00:47 GMT (envelope-from gnats) Resent-Date: Fri, 25 Jun 2004 10:00:47 GMT Resent-Message-Id: <200406251000.i5PA0lZk036208@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rene de Vries Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DBD3816A4CE for ; Fri, 25 Jun 2004 09:50:52 +0000 (GMT) Received: from bastix.tunix.nl (bastix.tunix.nl [193.79.201.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9E31643D2D for ; Fri, 25 Jun 2004 09:50:51 +0000 (GMT) (envelope-from rene@tunix.nl) Received: (from root@localhost) by bastix.tunix.nl (8.9.3c/8.6.12) id LAA59989 for ; Fri, 25 Jun 2004 11:49:49 +0200 (CEST) Received: by bastix.tunix.nl (TUNIX txp2/smap) for id sma059720; Fri, 25 Jun 04 11:48:46 +0200 Received: from upsilix.tunix.nl (upsilix.tunix.nl [172.16.2.22]) by fix.tunix.nl (8.10.2+Sun/8.10.2) with ESMTP id i5P9mjo09643 for ; Fri, 25 Jun 2004 11:48:45 +0200 (MEST) Received: from upsilix.tunix.nl (localhost.tunix.nl [127.0.0.1]) by upsilix.tunix.nl (8.12.8p2/8.12.6) with ESMTP id i5P9mjD2030283 for ; Fri, 25 Jun 2004 11:48:45 +0200 (CEST) (envelope-from rene@upsilix.tunix.nl) Received: (from rene@localhost) by upsilix.tunix.nl (8.12.8p2/8.12.6/Submit) id i5P9mjDT030274; Fri, 25 Jun 2004 11:48:45 +0200 (CEST) (envelope-from rene) Message-Id: <200406250948.i5P9mjDT030274@upsilix.tunix.nl> Date: Fri, 25 Jun 2004 11:48:45 +0200 (CEST) From: Rene de Vries To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/68311: it is impossible to override defaults with kernel specific configuration files X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rene de Vries List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2004 10:01:09 -0000 >Number: 68311 >Category: kern >Synopsis: it is impossible to override defaults with kernel specific configuration files >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Jun 25 10:00:46 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Rene de Vries >Release: FreeBSD 4.8 i386 >Organization: Tunix Internet Security & Training >Environment: System: FreeBSD upsilix.tunix.nl 4.8 FreeBSD 4.8-RELEASE-p22 #7: Wed Mar 3 15:00:31 CET 2004 rene@upsilix.tunix.nl:/usr/obj/usr/src/sys/UPSILIX i386 >Description: When for a specific kernel configuration a driver needs to be replaced this is impossible with the default 4.x config. Only additions can be made. After this fix also replacements work. >How-To-Repeat: >Fix: Index: usr.sbin/config/mkmakefile.c =================================================================== RCS file: usr.sbin/config/mkmakefile.c,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- usr.sbin/config/mkmakefile.c 2002/08/28 09:00:08 1.1.1.3 +++ usr.sbin/config/mkmakefile.c 2002/11/27 09:16:34 1.2 @@ -301,7 +301,7 @@ else isdup = 0; tp = 0; - if (first == 3 && pf == 0 && (tp = fltail_lookup(this)) != 0) { + if (first == 3 && pf != 0 && (tp = fltail_lookup(this)) != 0) { if (tp->f_type != INVISIBLE || tp->f_flags) printf("%s: Local file %s overrides %s.\n", fname, this, tp->f_fn); >Release-Note: >Audit-Trail: >Unformatted: