From owner-freebsd-arch@FreeBSD.ORG Mon Sep 8 11:26:33 2003 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA52916A4BF; Mon, 8 Sep 2003 11:26:32 -0700 (PDT) Received: from sccrmhc13.comcast.net (sccrmhc13.comcast.net [204.127.202.64]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D53E43FBF; Mon, 8 Sep 2003 11:26:31 -0700 (PDT) (envelope-from adam@migus.org) Received: from garple.migus.org ([68.55.83.100]) by comcast.net (sccrmhc13) with ESMTP id <2003090818262901600g6vhje>; Mon, 8 Sep 2003 18:26:29 +0000 Received: from garple.migus.org (localhost [127.0.0.1]) by garple.migus.org (8.12.9/8.12.9) with ESMTP id h88IQSui009995; Mon, 8 Sep 2003 14:26:28 -0400 (EDT) (envelope-from adam@migus.org) Received: (from www@localhost) by garple.migus.org (8.12.9/8.12.9/Submit) id h88IQRw6009994; Mon, 8 Sep 2003 14:26:27 -0400 (EDT) X-Authentication-Warning: garple.migus.org: www set sender to adam@migus.org using -f Received: from 204.254.155.35 (SquirrelMail authenticated user adam) by mail.migus.org with HTTP; Mon, 8 Sep 2003 14:26:27 -0400 (EDT) Message-ID: <57827.204.254.155.35.1063045587.squirrel@mail.migus.org> In-Reply-To: <20030908073749.A71336@FreeBSD.org> References: <49222.192.168.4.2.1062744486.squirrel@mail.migus.org> <20030908073749.A71336@FreeBSD.org> Date: Mon, 8 Sep 2003 14:26:27 -0400 (EDT) From: "Adam C. Migus" To: "Eivind Eklund" User-Agent: SquirrelMail/1.4.1 MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 Importance: Normal X-Spam-Status: No, hits=-2.4 required=5.0 tests=EMAIL_ATTRIBUTION,IN_REP_TO,PRIORITY_NO_NAME, QUOTED_EMAIL_TEXT,REFERENCES,REPLY_WITH_QUOTES,USER_AGENT, X_AUTH_WARNING version=2.55 X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) cc: freebsd-arch@FreeBSD.ORG cc: Kris Kennaway Subject: Re: config files in packages (Re: (proposal) new flag forpkg_delete) X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2003 18:26:33 -0000 Eivind Eklund said: > On Fri, Sep 05, 2003 at 02:48:06AM -0400, Adam C. Migus wrote: >> I agree with the something like the Debian approach but perhaps >> with >> more emphasis on comparison and automation than user interaction. >> It takes the worry out of the hands of the port maintainers, it >> keeps users from screwing up their installations, it's been done >> and >> shown to work it can be improved by offering a diff feature. > > See ports/sysutils/etcmerge for an implementation of 3-way merges of > /etc I did a little while ago. It handle conflicts reasonably (or > what > I think is reasonable, at least), including the case where a config > file > is deleted. Usually, it will completely automate upgrades. > > In order to do this, etcmerge requires a copy of the initial > ("sample") > configuration files as distributed by the vendor (FreeBSD, for the > present). For the present case, the easy way to get this is to run > mergemaster and copy the tree it creates in /var/tmp. It is not > possible to use a copy of the /etc just after install, as sysinstall > writes modifications to /etc before the user gets access to it, and > these modifications would be lost if it was copied as "base". > > It should be fairly simple to extend the technique to also cover > ports. > If we choose to do this, we should also make sysinstall store a copy > of > the initial /etc, to remove the need to run mergemaster to get a > copy. > > Eivind. > Eivind, I have been playing with your package for a little while now. I like it so far and was waiting to see if you had anything else in the way of enhancements for it prior to commenting (as you've only released 0.2 thus far). You're point about the base install didn't bother me as I was using it for diskless installations. I like both of your ideas, adapting it for ports and for sysinstall. Have you received any feedback? Are there any known bugs or limitations in the current revision that might preclude experimentation with doing this now? -- Adam - (http://people.migus.org/~amigus/) Migus Dot Org - (http://www.migus.org/)