Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Jul 2010 09:17:32 +0100
From:      Mike Clarke <jmc-freebsd2@milibyte.co.uk>
To:        freebsd-questions@freebsd.org
Cc:        zaxis <z_axis@163.com>
Subject:   Re: I donot like using mergemaster  ?
Message-ID:  <201007260917.32632.jmc-freebsd2@milibyte.co.uk>
In-Reply-To: <29262747.post@talk.nabble.com>
References:  <29262747.post@talk.nabble.com>

next in thread | previous in thread | raw e-mail | index | archive | help
On Monday 26 July 2010, zaxis wrote:

> I want to upgrade my freebsd 8.0  to 8.1.  I have read all the steps
> about upgrading freebsd. I feel mergemaster  is difficult to use e.g.
> which parameters should i use ?   (you may wish to use -U or -ai or
> -Fi)

I have the following in /etc/mergemaster.rc instead of having to 
remember the command line options each time:

# Install the new file if it differs only by VCS Id (-F)
FREEBSD_ID=yes
#
# Automatically upgrade files that have not been user modified (-U)
AUTO_UPGRADE=yes
#
# Automatically install files not on the system already (-i)
AUTO_INSTALL=yes
#
# Preserve files that you replace
PRESERVE_FILES=yes
#
# Delete stale files in /etc/rc.d without prompting
DELETE_STALE_RC_FILES=yes
#
# Compare /etc/rc.conf[.local] to /etc/defaults/rc.conf (-C)
COMP_CONFS=yes
#
######################################################
# The following options have no command line overrides
######################################################
#
# Files to always avoid comparing
IGNORE_FILES='/etc/motd /etc/printcap'
#
# Additional options for diff.  This will get unset when using -s.
DIFF_OPTIONS='-Bb'     # Ignore changes in whitespace

-- 
Mike Clarke



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007260917.32632.jmc-freebsd2>