From owner-freebsd-stable@FreeBSD.ORG Thu Mar 12 15:05:50 2009 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 5350E1065864 for ; Thu, 12 Mar 2009 15:05:50 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (lurza.secnetix.de [IPv6:2a01:170:102f::2]) by mx1.freebsd.org (Postfix) with ESMTP id C77CF8FC08 for ; Thu, 12 Mar 2009 15:05:49 +0000 (UTC) (envelope-from olli@lurza.secnetix.de) Received: from lurza.secnetix.de (localhost [127.0.0.1]) by lurza.secnetix.de (8.14.3/8.14.3) with ESMTP id n2CF5R89047735; Thu, 12 Mar 2009 16:05:47 +0100 (CET) (envelope-from oliver.fromme@secnetix.de) Received: (from olli@localhost) by lurza.secnetix.de (8.14.3/8.14.3/Submit) id n2CF5RXx047734; Thu, 12 Mar 2009 16:05:27 +0100 (CET) (envelope-from olli) Date: Thu, 12 Mar 2009 16:05:27 +0100 (CET) Message-Id: <200903121505.n2CF5RXx047734@lurza.secnetix.de> From: Oliver Fromme To: freebsd-stable@FreeBSD.ORG, antik@bsd.ee In-Reply-To: <49B8AB66.9080408@bsd.ee> X-Newsgroups: list.freebsd-stable User-Agent: tin/1.8.3-20070201 ("Scotasay") (UNIX) (FreeBSD/6.4-PRERELEASE-20080904 (i386)) MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.1.2 (lurza.secnetix.de [127.0.0.1]); Thu, 12 Mar 2009 16:05:47 +0100 (CET) Cc: Subject: Re: mergemaster annoyance or not? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-stable@FreeBSD.ORG, antik@bsd.ee List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Mar 2009 15:05:51 -0000 This is what I have in my /etc/mergemaster.rc; it will probably help in your case: DIFF_FLAG='-Bub' DIFF_OPTIONS='-I$FreeBSD:.*[$]' IGNORE_MOTD=yes The first line causes diff to not display changes that only affect whitespace. The second line ignores the CVS id lines, so that files will compare equal that only differ in the CVS ids. The third line lets me keep my motd file without being asked for it every time. There are options to keep other files, too, so you might want to add the master.passwd and group files to that list. However, sometines a new group or user needs to be created for proper operation -- that's why I prefer to see those files whenever they change. Please refer to the mergemaster(8) manual page for details. You might also want so set AUTO_INSTALL and AUTO_UPGRADE. Best regards Oliver PS: I think the above options should _not_ be on by default, because that would be a POLA violation. Those people who want them can easily add them to their mergemaster.rc file. -- Oliver Fromme, secnetix GmbH & Co. KG, Marktplatz 29, 85567 Grafing b. M. Handelsregister: Registergericht Muenchen, HRA 74606, Geschäftsfuehrung: secnetix Verwaltungsgesellsch. mbH, Handelsregister: Registergericht Mün- chen, HRB 125758, Geschäftsführer: Maik Bachmann, Olaf Erb, Ralf Gebhart FreeBSD-Dienstleistungen, -Produkte und mehr: http://www.secnetix.de/bsd "Perl will consistently give you what you want, unless what you want is consistency." -- Larry Wall