From owner-freebsd-questions Sun Jun 25 8:47:43 2000 Delivered-To: freebsd-questions@freebsd.org Received: from mostgraveconcern.com (mostgraveconcern.com [216.82.145.240]) by hub.freebsd.org (Postfix) with ESMTP id 204E237BAA4 for ; Sun, 25 Jun 2000 08:47:40 -0700 (PDT) (envelope-from dan@mostgraveconcern.com) Received: from danco (danco.mostgraveconcern.com [10.0.0.2]) by mostgraveconcern.com (8.9.3/8.9.3) with SMTP id IAA03743; Sun, 25 Jun 2000 08:47:38 -0700 (PDT) (envelope-from dan@mostgraveconcern.com) Message-ID: <005501bfdebc$b0576a40$0200000a@danco> Reply-To: "Dan O'Connor" From: "Dan O'Connor" To: "David J. Kanter" , "FreeBSD questions" Subject: Re: Mergemaster question Date: Sun, 25 Jun 2000 08:47:37 -0700 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 4.72.3155.0 X-MimeOLE: Produced By Microsoft MimeOLE V4.72.3155.0 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG >I just went from 3.4 to 3.5 and used mergemaster for the first time. I was a >little confused and overwhelmed, but this is how I handled it and would like >others to let me know what they think: > >All the files that I had made changes to personally, like personalizing my >sendmail.cf, named.conf, and inetd.conf files, I left alone. But the other >"standard" files that are a part of a basic FreeBSD install I let >mergemaster overwrite. For instance, MAKEDEV, /etc/fbtab, /etc.rc, >named.root, and such. Once you get used to mergemaster, you'll never go back. :-) Your approach is pretty much the same as mine: I review (and merge as necessary) files that I know I've modified, install the newer versions of files I know I haven't modified, and under no circumstances allow it to touch /etc/passwd, /etc/master.passwd, or /etc/group. --Dan -- Dan O'Connor On Matters of Most Grave Concern http://www.mostgraveconcern.com To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message