Date: Sat, 17 Nov 2007 20:06:10 -0500 From: Howard Goldstein <hg@queue.to> To: keramida@ceid.upatras.gr Cc: freebsd-questions@freebsd.org Subject: Re: Making mergemaster skip certain files Message-ID: <473F9002.6040703@queue.to> In-Reply-To: <20071117181156.GC2834@kobe.laptop> References: <20071117043426.GA71265@auricle.charter.net> <20071117181156.GC2834@kobe.laptop>
next in thread | previous in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?473F9002.6040703>