From owner-freebsd-questions@FreeBSD.ORG  Sun Nov 18 01:33:13 2007
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB69316A46D
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 01:33:13 +0000 (UTC) (envelope-from hg@queue.to)
Received: from pickle.queue.to (pickle.queue.to [71.180.69.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 824BA13C467
	for <freebsd-questions@freebsd.org>;
	Sun, 18 Nov 2007 01:33:13 +0000 (UTC) (envelope-from hg@queue.to)
Received: (qmail 59838 invoked from network); 17 Nov 2007 20:06:10 -0500
Received: from cally.queue.to (172.16.0.6)
	by pickle.queue.to with ESMTP; 17 Nov 2007 20:06:10 -0500
Message-ID: <473F9002.6040703@queue.to>
Date: Sat, 17 Nov 2007 20:06:10 -0500
From: Howard Goldstein <hg@queue.to>
User-Agent: Thunderbird 2.0.0.9 (X11/20071116)
MIME-Version: 1.0
To: keramida@ceid.upatras.gr
References: <20071117043426.GA71265@auricle.charter.net>
	<20071117181156.GC2834@kobe.laptop>
In-Reply-To: <20071117181156.GC2834@kobe.laptop>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-questions@freebsd.org
Subject: Re: Making mergemaster skip certain files
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Nov 2007 01:33:13 -0000

Giorgos Keramidas wrote:
> On 2007-11-16 22:34, "J. Porter Clark" <jpc@porterclark.com> wrote:
> mergemaster for more details, but here's a short description of what I
> use on my laptop for some time now:

Please consider submitting this as a PR in hopes it gets included in the
actual package.


> 
> 1. A `.mergemasterrc' file in the HOME directory of the `root' user,
>    which contains:
> 
> 	STRICT=no
> 	MM_PRE_COMPARE_SCRIPT=/root/mm-pre-compare.sh
> 
> 2. The `/root/mm-pre-compare.sh' script contains the following:
> 
>         #!/bin/sh
> 
>         # NOTE: No PATH needed, because mm's PATH is already
> 	# draconian enough.
> 
> 	# If TEMPROOT is not set, or it is set to a path which
> 	# resolves to the real root filesystem, abort early, before we
> 	# trash the config files of the installed root filesystem.
> 
>         if test -z "${TEMPROOT}" ; then
>                 echo >&2 "$0: error: TEMPROOT is unset or empty."
>                 exit 1
>         fi
>         p=`realpath "${TEMPROOT}"`
>         if test "${p}" = '/' ; then
>                 echo >&2 "$0: error: TEMPROOT is the real root filesystem."
>                 exit 2
>         fi
> 
>         case "${PRE_WORLD}" in
>         '')
>                 # The following files always have local changes.
>                 # Remove them from ${TEMPROOT} to force mergemaster(8)
>                 # to ignore these files when comparing /etc directories.
> 
>                 rm -f "${TEMPROOT}/.cshrc"
>                 rm -f "${TEMPROOT}/.profile"
>                 rm -f "${TEMPROOT}/root/.cshrc"
>                 rm -f "${TEMPROOT}/root/.profile"
> 
>                 rm -f "${TEMPROOT}/etc/hosts"
>                 rm -f "${TEMPROOT}/etc/networks"
> 
>                 rm -f "${TEMPROOT}/etc/motd"
>                 rm -f "${TEMPROOT}/etc/printcap"
> 
>                 ;;
>         esac
> 
> _______________________________________________
> freebsd-questions@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-questions
> To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.org"