From owner-freebsd-current  Mon Jan 29 20:25: 5 2001
Delivered-To: freebsd-current@freebsd.org
Received: from wilson.acpub.duke.edu (wilson.acpub.duke.edu [152.3.233.69])
	by hub.freebsd.org (Postfix) with ESMTP id 51A5637B402
	for <freebsd-current@FreeBSD.ORG>; Mon, 29 Jan 2001 20:24:44 -0800 (PST)
Received: from bobzilla.adsl.duke.edu (bobzilla.adsl.duke.edu [152.16.67.15]) 
	by wilson.acpub.duke.edu (8.9.3/8.9.3/Duke-5.0.0) with ESMTP id XAA27006;
	Mon, 29 Jan 2001 23:24:41 -0500 (EST)
Received: (from sto@localhost)
	by bobzilla.adsl.duke.edu (8.11.1/8.11.1) id f0U4OhC47088
	for freebsd-current@FreeBSD.ORG; Mon, 29 Jan 2001 23:24:43 -0500 (EST)
	(envelope-from sto)
Date: Mon, 29 Jan 2001 23:24:43 -0500
From: "Sean O'Connell" <sean@stat.Duke.EDU>
To: freebsd-current@FreeBSD.ORG
Subject: Re: /etc/shells #include syntax support patch
Message-ID: <20010129232443.A47058@stat.Duke.EDU>
Reply-To: "Sean O'Connell" <sean@stat.Duke.EDU>
Mail-Followup-To: Sean O'Connell <sean@stat.Duke.EDU>,
	freebsd-current@FreeBSD.ORG
References: <20010128101349.2c94539f.steveo@eircom.net> <20010128190227.B25222@spawn.nectar.com> <200101290453.f0T4roq13148@whizzo.transsys.com> <20010129105930.C62046@lflat.vas.mobilix.dk> <xzpg0i2ljjz.fsf@flood.ping.uio.no> <lyzog9lq2z.wl@lambda.is.akita-u.ac.jp> <14966.15560.809818.773206@guru.mired.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
In-Reply-To: <14966.15560.809818.773206@guru.mired.org>; from mwm@mired.org on Mon, Jan 29, 2001 at 10:02:16PM -0600
X-Organization: House of Schmutzli
X-Kitties: Bitty Maya CJ Keisha Jacob Hopey
X-Hounds: Bob Sheana
X-OS-of-Choice: FreeBSD
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Mike Meyer stated:
: sig@is.akita-u.ac.jp types:
: > At 29 Jan 2001 11:49:36 +0100,
: > Dag-Erling Smorgrav <des@ofug.org> wrote:
: > > No. Mergemaster doesn't care about the contents of the file, only
: > > about its $FreeBSD$ tag. As long as this stays the same, it'll leave
: > > the file alone. If you remove the $FreeBSD$ tag in the installed file
: > > or someone commits to src/etc/shells, mergemaster will prompt you.
: > I want mergemaster(8) to have a list not to compare.  It is not
: > necessary for mergemaster(8) to compare host specific files, for
: > example, /etc/hosts, /etc/printcap and /etc/shells, to their
: > originals in /usr/src.  I want that system managers for local
: > hosts can decide which files follow the source and which files
: > do not.
: 
: There was some discussion of about this on -questions (I think it was)
: a while back, and the author commented on some things he was working
: on. You might look through those, then nudge him about it.

You have been able to do it with mergemaster for quite some time
now. How I do this is to add

MM_PRE_COMPARE_SCRIPT='/path/to/my/mmprecompare.sh'

to my (and hence root .. I use sudo) .mergemasterrc file. And
mmprecompare.sh consists of:

<----------------- snip ---------------------------->
#! /bin/sh

# Create a log file ??
DATE=`date +%Y%m%d`
LOGFILE="/tmp/mergemaster-${DATE}"

# Ignore these files
IGNORE_LIST="/.cshrc \
                /etc/mail/aliases \
                /etc/csh.cshrc \
                /etc/csh.login \
                /etc/dhclient.conf \
                /etc/group \
                /etc/hosts \
                /etc/hosts.allow \
                /etc/hosts.equiv \
                /etc/hosts.lpd \
                /etc/mail/sendmail.cf \
                /etc/master.passwd \
                /etc/namedb/PROTO.localhost.rev \
                /etc/namedb/make-localhost \
                /etc/namedb/named.conf \
                /etc/namedb/named.root \
                /etc/newsyslog.conf \
                /etc/printcap \
                /etc/ssh/ssh_config \
                /etc/ssh/sshd_config \
                /etc/syslog.conf \
                /etc/ttys \
                /root/.cshrc \
                /root/.login"
#
# remove w/o complaint the files in question
#
for IGNORE in ${IGNORE_LIST}
do
   #
   IDENT1=`ident "${DESTDIR}${IGNORE}" 2>&1`
   IDENT2=`ident "${TEMPROOT}${IGNORE}" 2>&1`
   case "${IDENT2}" in 
   *'no id keywords'*)
      ;;
   ."${IDENT1}")
      # No worries ???
      # echo " *** ${DESTDIR}${IGNORE} is the same ***" | tee "${LOGFILE}"
      ;;
   *)
      # Ruh-Roh!
      echo " *** ${DESTDIR}${IGNORE} has changed! ***" | tee "${LOGFILE}"
      ;;
   esac
   #
   rm "${TEMPROOT}${IGNORE}"
done
#
<----------------- snip ---------------------------->




-- 
1--------01---------01--------01--------01--------01--------01--------0
Sean O'Connell                                       sean@stat.Duke.EDU


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