From owner-freebsd-questions@FreeBSD.ORG Thu Feb 1 21:44:25 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9775A16A400 for ; Thu, 1 Feb 2007 21:44:25 +0000 (UTC) (envelope-from youshi10@u.washington.edu) Received: from mxout1.cac.washington.edu (mxout1.cac.washington.edu [140.142.32.134]) by mx1.freebsd.org (Postfix) with ESMTP id 7D69D13C4A5 for ; Thu, 1 Feb 2007 21:44:25 +0000 (UTC) (envelope-from youshi10@u.washington.edu) Received: from hymn05.u.washington.edu (hymn05.u.washington.edu [140.142.12.184]) by mxout1.cac.washington.edu (8.13.7+UW06.06/8.13.7+UW06.09) with ESMTP id l11LiO7L011741 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 1 Feb 2007 13:44:25 -0800 Received: from localhost (localhost [127.0.0.1]) by hymn05.u.washington.edu (8.13.7+UW06.06/8.13.7+UW06.09) with ESMTP id l11LiO4x032277 for ; Thu, 1 Feb 2007 13:44:24 -0800 X-Auth-Received: from [192.55.52.1] by hymn05.u.washington.edu via HTTP; Thu, 01 Feb 2007 13:44:24 PST Date: Thu, 1 Feb 2007 13:44:24 -0800 (PST) From: youshi10@u.washington.edu To: freebsd-questions@freebsd.org In-Reply-To: <20070201213427.GA55792@slackbox.xs4all.nl> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-PMX-Version: 5.3.0.289146, Antispam-Engine: 2.5.0.283055, Antispam-Data: 2007.2.1.132933 X-Uwash-Spam: Gauge=IIIIIII, Probability=7%, Report='NO_REAL_NAME 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __HAS_MSGID 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0' Subject: Re: How to upgrade an exist freebsd to freebsd6.2 ? 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: Thu, 01 Feb 2007 21:44:25 -0000 On Thu, 1 Feb 2007, Roland Smith wrote: > On Thu, Feb 01, 2007 at 04:02:33PM -0500, Dak Ghatikachalam wrote: >> This worked great but on mergemaster -cv in single user , at one point it >> asked me these questions , I got nervous and puzzled >> >> Use 'd' to delete the temporary ."xxxxxxxxxxxxxxxxx" >> Use 'i' to install the temporary ."xxxxxxxxxxxxxxxxx" >> Use 'm' to merge the temporary and installed versions >> Use 'v' to view the diff results again >> >> # xxx refers to path for config files, I running on default freebsd mode >> and did not made any change > > Config files can be enhanced/updated in between versions. > >> I just presses ENTER key the default ( because it advised to be left for >> later consideration" >> >> DO I just not bother any more. > > If it is a file where you are certain you haven't made changes, choose > 'i'. (E. g. the scripts in /etc/rc.d) > > For some files it is better to keep your version, like /etc/rc.conf, or > /etc/hosts. So it's probably best to choose 'd', or save for later. > > In other files, like /etc/group, you want to keep your modifications, > but you probably also want to keep the changes that the new version > makes. Sometimes the new groups are essential for the running of the > systems. In this case you can either use merge, or save it for later. > > What I tend to do is to keep copies of all the config files that I have > changed in a subdirectory ~/settings. If I want to make changes > to one of those files, I make the changes in the file in ~/settings, and > then copy them to /etc. The files in ~/settings are kept under revision > control (e.g. RCS), so that I retain previous versions. This enables me > to repair things if I screw something up. > > Roland > -- > R.F.Smith http://www.xs4all.nl/~rsmith/ > [plain text _non-HTML_ PGP/GnuPG encrypted/signed email much appreciated] > pgp: 1A2B 477F 9970 BA3C 2914 B7CE 1277 EFB0 C321 A725 (KeyID: C321A725) Did fry me a bit though when I moved one of my machines from 6.2-release to 7. mergemaster toasted my /etc/group file -_-... Isn't there a file or directive (like .keep) that tells mergemaster not to check or replace a file? -Garrett