From owner-freebsd-questions Wed Dec 22 18:19:58 1999 Delivered-To: freebsd-questions@freebsd.org Received: from mail.greatbasin.net (mail.greatbasin.net [207.228.35.39]) by hub.freebsd.org (Postfix) with ESMTP id 7AD1315654 for ; Wed, 22 Dec 1999 18:19:55 -0800 (PST) (envelope-from dan@jgl.reno.nv.us) Received: from jgl.reno.nv.us (rno-max8-62.gbis.net [207.228.62.62]) by mail.greatbasin.net (8.9.3/8.9.3) with ESMTP id SAA25996; Wed, 22 Dec 1999 18:19:52 -0800 (PST) Received: from danco (danco.home [10.0.0.2]) by jgl.reno.nv.us (8.9.3/8.9.3) with SMTP id SAA12858; Wed, 22 Dec 1999 18:19:48 -0800 (PST) (envelope-from dan@jgl.reno.nv.us) Message-ID: <00ad01bf4cec$2f096180$0200000a@danco.home> From: "Dan O'Connor" To: "Jonathon McKitrick" , "Sheldon Hearn" Cc: Subject: Re: mergemaster after upgrade Date: Wed, 22 Dec 1999 18:19:42 -0800 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 >So the best bet is to just carefully go through mergemaster, and figure >out what everything means? Then decide whether it needs merging or not? My theory is to merge in ALL the new stuff, but to watch carefully for things in certain files that I have explicitly configured. For example, I have all my rc.conf overrides in /etc/rc.conf, so I let mergemaster happily replace the whole /etc/defaults/rc.conf. But I don't let it touch /etc/groups or /etc/passwd. Most of the rest of the files need some scrutiny, to see what changed. And soon enough, you'll figure out which files you need to really watch closely so you don't blow away your settings... I found mergemaster kind of daunting at first (I was happily editing changes by hand at the time), but after a while it really grows on you. Guess that's why it's part of the core system now :-) Good luck! --Dan ** The thing I like most about Windows 98 is... ** You can download FreeBSD with it! To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message