From owner-freebsd-stable@FreeBSD.ORG Tue Dec 4 21:19:18 2007 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F343E16A421 for ; Tue, 4 Dec 2007 21:19:17 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from pd3mo1so.prod.shaw.ca (idcmail-mo1so.shaw.ca [24.71.223.10]) by mx1.freebsd.org (Postfix) with ESMTP id C8E9213C47E for ; Tue, 4 Dec 2007 21:19:17 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from pd3mr3so.prod.shaw.ca (pd3mr3so-qfe3.prod.shaw.ca [10.0.141.179]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0JSJ00J6KN5SP950@l-daemon> for freebsd-stable@freebsd.org; Tue, 04 Dec 2007 14:17:52 -0700 (MST) Received: from pn2ml5so.prod.shaw.ca ([10.0.121.149]) by pd3mr3so.prod.shaw.ca (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JSJ007A4N5PKSA0@pd3mr3so.prod.shaw.ca> for freebsd-stable@freebsd.org; Tue, 04 Dec 2007 14:17:52 -0700 (MST) Received: from hexahedron.daemonology.net ([24.82.201.197]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with SMTP id <0JSJ007ZIN5AXH50@l-daemon> for freebsd-stable@freebsd.org; Tue, 04 Dec 2007 14:17:34 -0700 (MST) Received: (qmail 4713 invoked from network); Tue, 04 Dec 2007 21:17:32 +0000 Received: from unknown (HELO hexahedron.daemonology.net) (127.0.0.1) by localhost with SMTP; Tue, 04 Dec 2007 21:17:32 +0000 Date: Tue, 04 Dec 2007 13:17:31 -0800 From: Colin Percival In-reply-to: <200711291451.47268.jhb@freebsd.org> To: John Baldwin Message-id: <4755C3EB.8010108@freebsd.org> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Enigmail-Version: 0.95.5 References: <47436A80.30306@quip.cz> <474DC5BF.7010405@freebsd.org> <200711291451.47268.jhb@freebsd.org> User-Agent: Thunderbird 2.0.0.9 (X11/20071117) Cc: freebsd-stable@freebsd.org Subject: Re: missing .cshrc and pf.conf after upgrade to 7.0-beta3 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Dec 2007 21:19:18 -0000 John Baldwin wrote: > On Wednesday 28 November 2007 02:47:11 pm Colin Percival wrote: >> Miroslav Lachman wrote: >>> I am not 100% sure, maybe I overlook something in binary major version >>> upgrade procedure, but after upgrade from 6.2 to 7.0-BETA3 my roots >>> ~/.cshrc was "accidentally" replaced with dist version of .cshrc and >>> /etc/pf.conf is missing. >> The fact that /etc/pf.conf disappeared is due to it being removed from >> the release (it is now in /usr/share/examples/etc). The fact that /.cshrc >> was upgraded in spite of having been locally modified is probably a bad >> idea -- I'll change the default freebsd-update.conf to deal with this. > > Considering that /etc/pf.conf is a file that users edit to configure pf(4), > removing it out from under them is probably a very bad idea. The heuristics didn't work this time. :-( FreeBSD Update tries to guess what users want to have done -- in this case, the heuristic is "if a configuration file is present in release X but not in release Y, it's probably not relevant in release Y; so let's delete it". The case of a default configuration file being moved from /etc/ into /usr/share/examples/etc is one which I didn't consider; but I think the general heuristic is a good one (consider the scenario where a /etc/foo.conf is renamed to /etc/food.conf -- with the current heuristic, at least the user gets a warning that the file is disappearing rather than suddenly finding that the foo daemon isn't starting up properly for no apparent reason). Colin Percival