bin/106642: Allow excluding certain files from mergemaster(8)

[Henrik Brix Andersen]

>Number:         106642
>Category:       bin
>Synopsis:       Allow excluding certain files from mergemaster(8)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 12 12:50:04 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Henrik Brix Andersen
>Release:        FreeBSD 6.2-PRERELEASE i386
>Organization:
pil.dk
>Environment:
System: FreeBSD fangorn.brixandersen.dk 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #34: Wed Dec 6 14:31:40 CET 2006 root at fangorn.brixandersen.dk:/usr/obj/usr/src/sys/FANGORN i386


	
>Description:
The current version of mergemaster(8) allows excluding /etc/motd from
the comparison. This feature would be nice to have for other files as
well (/etc/mail/mailer.conf, /etc/printcap, ...).

	
>How-To-Repeat:
	
>Fix:
The patch below adds a variables, IGNORE_FILES, which can be set in
mergemaster.rc to a list of the files to ignore when running
mergemaster(8).

	

--- mergemaster.diff begins here ---
diff -u mergemaster.orig/mergemaster.8 mergemaster/mergemaster.8
--- mergemaster.orig/mergemaster.8	Tue Dec 12 13:27:16 2006
+++ mergemaster/mergemaster.8	Tue Dec 12 13:40:45 2006
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/usr.sbin/mergemaster/mergemaster.8,v 1.32.2.3 2006/06/10 21:42:49 gordon Exp $
 .\"
-.Dd February 4, 2006
+.Dd December 12, 2006
 .Dt MERGEMASTER 8
 .Os
 .Sh NAME
@@ -337,6 +337,9 @@
 #
 # Don't compare the old and new motd files
 #IGNORE_MOTD=yes
+#
+# Don't compare the following files
+#IGNORE_FILES=
 #
 # Specify the path to scripts to run before the comparison starts,
 # and/or after the script has finished its work
diff -u mergemaster.orig/mergemaster.sh mergemaster/mergemaster.sh
--- mergemaster.orig/mergemaster.sh	Tue Dec 12 13:27:16 2006
+++ mergemaster/mergemaster.sh	Tue Dec 12 13:27:45 2006
@@ -601,9 +601,14 @@
   # Avoid comparing the motd if the user specifies it in .mergemasterrc
   case "${IGNORE_MOTD}" in
   '') ;;
-  *) rm -f ${TEMPROOT}/etc/motd
+  *) IGNORE_FILES="${IGNORE_FILES} /etc/motd"
      ;;
   esac
+
+  # Avoid comparing the following user specified files
+  for file in ${IGNORE_FILES}; do
+      rm -f ${TEMPROOT}/${file}
+  done
 
   # Avoid trying to update MAKEDEV if /dev is on a devfs
   if /sbin/sysctl vfs.devfs.generation > /dev/null 2>&1 ; then
--- mergemaster.diff ends here ---


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