From owner-freebsd-bugs  Mon Jun 12 10:20: 6 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8B24637B95B
	for <freebsd-bugs@FreeBSD.org>; Mon, 12 Jun 2000 10:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA82429;
	Mon, 12 Jun 2000 10:20:01 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from isds.duke.edu (davinci.isds.duke.edu [152.3.22.1])
	by hub.freebsd.org (Postfix) with ESMTP id 4CDD337B881
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Jun 2000 10:19:11 -0700 (PDT)
	(envelope-from sto@stat.Duke.EDU)
Received: from feta.isds.duke.edu (feta.isds.duke.edu [152.3.22.76])
	by isds.duke.edu (8.8.8/8.8.8) with ESMTP id NAA00702
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Jun 2000 13:19:10 -0400 (EDT)
Received: (from sto@localhost)
	by feta.isds.duke.edu (8.9.3/8.9.3) id NAA03277;
	Mon, 12 Jun 2000 13:19:10 -0400 (EDT)
	(envelope-from sto)
Message-Id: <200006121719.NAA03277@feta.isds.duke.edu>
Date: Mon, 12 Jun 2000 13:19:10 -0400 (EDT)
From: sean@stat.Duke.EDU
Reply-To: sean@stat.Duke.EDU
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: conf/19217: Addition of IGNORE_LIST to mergemaster script
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         19217
>Category:       conf
>Synopsis:       Add an IGNORE_LIST to mergemaster.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 12 10:20:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Sean O'Connell
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
Institute of Statistics and Decision Sciences
>Environment:

	FreeBSD Releng_4

>Description:

	It would be nice to have the option of forcing mergemaster
	to ignore certain critical files to speed up the process.
	This would allow for greater administrative flexibility.

>How-To-Repeat:

	Run megemaster :)

>Fix:

	The following patch to meremaster creates an IGNORE_LIST supplied
	from the administrator's/root's .mergemasterrc file.


--- mergemaster.sh.orig	Thu Mar  2 17:31:36 2000
+++ mergemaster.sh	Thu Apr 13 23:21:24 2000
@@ -260,6 +260,16 @@
      ;;
   esac
 
+  # Like to have a list of files that we really don't want to have
+  # mergermaster hassle us about.
+  case "${IGNORE_LIST}" in
+  '') ;;
+  *)  for IGNORED in ${IGNORE_LIST}; do
+        rm ${TEMPROOT}/${IGNORED}
+      done
+      ;;
+  esac
+
   ;; # End of the "RERUN" test
 esac
 

And here is an excerpt from my .mergemasterrc showing how I use this:


IGNORE_LIST=".cshrc \
		.login \
		etc/aliases \
		etc/csh.cshrc \
		etc/csh.login \
		etc/dhclient.conf \
		etc/group \
		etc/host.conf \
		etc/hosts \
		etc/hosts.allow \
		etc/hosts.equiv \
		etc/hosts.lpd \
		etc/mail/sendmail.cf \
		etc/master.passwd \
		etc/newsyslog.conf \
		etc/printcap \
		etc/ssh/ssh_config \
		etc/ssh/sshd_config \
		etc/syslog.conf \
		etc/ttys \
		root/.cshrc \
		root/.login"
#

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message