From owner-freebsd-current@FreeBSD.ORG Thu Jul 12 00:14:11 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AED0B16A400 for ; Thu, 12 Jul 2007 00:14:11 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with SMTP id 441AF13C459 for ; Thu, 12 Jul 2007 00:14:11 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 22025 invoked by uid 399); 12 Jul 2007 00:06:48 -0000 Received: from localhost (HELO ?192.168.0.6?) (dougb@dougbarton.us@127.0.0.1) by localhost with SMTP; 12 Jul 2007 00:06:48 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <46957093.2030701@FreeBSD.org> Date: Wed, 11 Jul 2007 17:06:43 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: Garrett Cooper References: <20070419133550.GA65054@tirith.brixandersen.dk> <20070419200929.GA70735@tirith.brixandersen.dk> <4693BC3E.1050605@web.am> <200707110115.42139.pieter@degoeje.nl> <469417CB.7010705@FreeBSD.org> <4694AAF1.6050302@web.am> <46951CC2.5050602@FreeBSD.org> <46955C9E.6090101@u.washington.edu> In-Reply-To: <46955C9E.6090101@u.washington.edu> X-Enigmail-Version: 0.95.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Pieter de Goeje , Gaspar Chilingarov , freebsd-current@freebsd.org Subject: Re: RFT: bin/106642: [patch] Allow excluding certain files from mergemaster (8) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 00:14:11 -0000 Garrett Cooper wrote: > Doug Barton wrote: >> Gaspar Chilingarov wrote: >> >> >>> Well another question -- is it possible teach somehow mergemaster, that >>> it should never touch passwd, groups, /etc/ttys or bunch of another >>> files? >>> >> >> Sure, you just do the opposite of what I did in the last script. If >> the file doesn't exist in the temproot when it's time to start >> comparing, mergemaster will never do anything with it. So here is some >> more out of the script that I actually use: >> >> #!/bin/sh >> # NOTE: No PATH needed, because mm's PATH is already draconian enough >> case "${PRE_WORLD}" in >> '') rm -f /etc/defaults/pccard.conf >> rm -f ${TEMPROOT}/etc/motd >> rm -f ${TEMPROOT}/etc/printcap >> rm -f ${TEMPROOT}/etc/namedb/named.* >> ;; >> esac >> >> > What if a user or group was added to /etc/group or /etc/passwd that was > required for the updated version of the OS? I would see this behavior a > bit counterproductive in this case. That's what the -p (PRE_WORLD) option is for. Doug -- This .signature sanitized for your protection