From owner-freebsd-stable Wed Oct 16 11: 6:44 2002 Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D000D37B401 for ; Wed, 16 Oct 2002 11:06:42 -0700 (PDT) Received: from mail-relay-1.ision.net (mail-relay-1.ision.net [194.163.252.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C92443EB1 for ; Wed, 16 Oct 2002 11:06:37 -0700 (PDT) (envelope-from dwalin@raven.addict.de) Received: from black.ma.choin.net (black.ma.choin.net [194.64.24.49]) by mail-relay-1.ision.net (8.12.5) with ESMTP id for ; Wed, 16 Oct 2002 19:57:35 +0200 (MET DST) Received: from raven.addict.de ([212.116.4.50]) by black.ma.choin.net (8.11.1/8.11.1) with ESMTP id g9GJ9ig95819 for ; Wed, 16 Oct 2002 21:09:45 +0200 (CEST) (envelope-from dwalin@raven.addict.de) Received: from raven.addict.de (dwalin@localhost [127.0.0.1]) by raven.addict.de (8.12.3/8.12.3) with ESMTP id g9GHYNr8051402; Wed, 16 Oct 2002 19:34:23 +0200 (CEST) (envelope-from dwalin@raven.addict.de) Received: (from dwalin@localhost) by raven.addict.de (8.12.3/8.12.3/Submit) id g9GHYMoc051401; Wed, 16 Oct 2002 19:34:22 +0200 (CEST) Date: Wed, 16 Oct 2002 19:34:22 +0200 From: Juergen Unger To: freebsd-stable@FreeBSD.ORG Cc: Michael Bretterklieber Subject: Re: Mergemaster [was: Re: Ifconfig config of gif tunnels] Message-ID: <20021016193422.A51167@raven.addict.de> References: <004401c2742a$d6169d90$6501a8c0@VAIO650> <3DAC0045.4060201@Kernick.org> <3DAC163D.1060701@inode.at> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.4i In-Reply-To: <3DAC163D.1060701@inode.at>; from mbretter@inode.at on Tue, Oct 15, 2002 at 03:21:01PM +0200 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Hi ! On Tue, Oct 15, 2002 at 03:21:01PM +0200, Michael Bretterklieber wrote: > I think something like /etc/defaults/mergemaster.conf, where for each > file or for each directory (or pattern) can be defined the action, like > "always update", "never update", "merge". > > There are many files wich can be always updated during mergemaster like > /etc/periodic or rc.*. > > The user should be able to overwrite the settings in his own > /etc/mergemaster.conf (same system like for rc.conf or make.conf). > > It would be great to have this or something like this in mergemaster, > because this can save many time. it like this idea but I do have another suggestion wich can be implemented additionally: If the version of a file changed let mergemaster look if the old existing file was modified at all. This can be done for example with a lookup of the original file via cvs. If the old existing file was never modified by an admin then let mergemaster silently install the new version. So all such files like /etc/periodic/*, /etc/mtree/*, /etc/default/* and others are updated automatically without the need of interaction from the updating admin... sure this should be configurable and can be combined with the idea of an /etc/defaults/mergemaster.conf. If a file is then mentioned in /etc/defaults/mergemaster.conf or /etc/mergemaster.conf the file is processed like defined there. If the file it is not listed in a .../mergemaster.conf then check the cvs if the old file was modified, if not install the new version. If modified ask the updating admin what to do... bye, -Juergen-Unger- -- .no_sig To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message