From sto@stat.Duke.EDU  Mon Jun 12 10:19:12 2000
Return-Path: <sto@stat.Duke.EDU>
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
Sender: sto@stat.Duke.EDU
Reply-To: sean@stat.Duke.EDU
To: FreeBSD-gnats-submit@freebsd.org
Subject: Addition of IGNORE_LIST to mergemaster script
X-Send-Pr-Version: 3.2

>Number:         19217
>Category:       conf
>Synopsis:       Add an IGNORE_LIST to mergemaster.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    dougb
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 12 10:20:01 PDT 2000
>Closed-Date:    Mon Oct 30 04:13:17 PST 2000
>Last-Modified:  Mon Oct 30 04:15:15 PST 2000
>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:
State-Changed-From-To: open->suspended 
State-Changed-By: billf 
State-Changed-When: Mon Jun 19 10:46:46 PDT 2000 
State-Changed-Why:  
The author of mergemaster would like to implement this change, 
but will be doing this differently 


Responsible-Changed-From-To: freebsd-bugs->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Mon Jun 19 10:46:46 PDT 2000 
Responsible-Changed-Why:  
I'm co-maintainer of mergemaster 

http://www.freebsd.org/cgi/query-pr.cgi?pr=19217 
Responsible-Changed-From-To: billf->dougb 
Responsible-Changed-By: dougb 
Responsible-Changed-When: Fri Oct 27 03:19:42 PDT 2000 
Responsible-Changed-Why:  
I am a committer now 
This idea is going to be implemented through the user having the ability 
to add custom scripts of their own invention to their mm run.  
I'm leaving it suspended till I actually get those bits committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=19217 
State-Changed-From-To: suspended->closed 
State-Changed-By: dougb 
State-Changed-When: Mon Oct 30 04:13:17 PST 2000 
State-Changed-Why:  
Instead of adding this specific functionality to mm, I 
decided instead to add more general scripting hooks 
which will allow the user to specify this kind of 
functionality, as well as others. The code to do this 
has been committed to RELENG_5, and will be MFC'ed asap. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=19217 
>Unformatted:
