Date: Mon, 26 Jul 2010 18:18:22 -0700 (PDT) From: zaxis <z_axis@163.com> To: freebsd-questions@freebsd.org Subject: Re: I donot like using mergemaster ? Message-ID: <29272211.post@talk.nabble.com> In-Reply-To: <201007260917.32632.jmc-freebsd2@milibyte.co.uk> References: <29262747.post@talk.nabble.com> <201007260917.32632.jmc-freebsd2@milibyte.co.uk>
index | next in thread | previous in thread | raw e-mail
that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0. Mike Clarke-17 wrote: > > 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 > _______________________________________________ > 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" > > ----- e^(π⋅i) + 1 = 0 -- View this message in context: http://old.nabble.com/I-donot-like-using-mergemaster----tp29262747p29272211.html Sent from the freebsd-questions mailing list archive at Nabble.com.help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?29272211.post>