From owner-freebsd-questions@FreeBSD.ORG Mon Jul 26 08:17:35 2010 Return-Path: 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 8C29F106564A for ; Mon, 26 Jul 2010 08:17:35 +0000 (UTC) (envelope-from jmc-freebsd2@milibyte.co.uk) Received: from relay.pcl-ipout01.plus.net (relay.pcl-ipout01.plus.net [212.159.7.99]) by mx1.freebsd.org (Postfix) with ESMTP id 396C28FC12 for ; Mon, 26 Jul 2010 08:17:34 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgoHAJfhTEzUnw4U/2dsb2JhbACTGYxHcb5khTYE Received: from outmx08.plus.net ([212.159.14.20]) by relay.pcl-ipout01.plus.net with ESMTP; 26 Jul 2010 09:17:33 +0100 Received: from helix.plus.com ([84.92.153.232] helo=curlew.milibyte.co.uk) by outmx08.plus.net with esmtp (Exim) id 1OdIsP-0004n2-2x; Mon, 26 Jul 2010 09:17:33 +0100 Received: by curlew.milibyte.co.uk with local (Exim 4.72) (envelope-from ) id 1OdIsO-0000pJ-Ni; Mon, 26 Jul 2010 09:17:32 +0100 From: Mike Clarke To: freebsd-questions@freebsd.org Date: Mon, 26 Jul 2010 09:17:32 +0100 User-Agent: KMail/1.9.10 References: <29262747.post@talk.nabble.com> In-Reply-To: <29262747.post@talk.nabble.com> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <201007260917.32632.jmc-freebsd2@milibyte.co.uk> X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: jmc-freebsd2@milibyte.co.uk X-SA-Exim-Scanned: No (on curlew.milibyte.co.uk); SAEximRunCond expanded to false Cc: zaxis Subject: Re: I donot like using mergemaster ? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2010 08:17:35 -0000 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