From owner-freebsd-questions Sat Jul 29 14:49:57 2000 Delivered-To: freebsd-questions@freebsd.org Received: from dt052n3e.san.rr.com (dt052n3e.san.rr.com [204.210.33.62]) by hub.freebsd.org (Postfix) with ESMTP id 82AF037B592 for ; Sat, 29 Jul 2000 14:49:54 -0700 (PDT) (envelope-from DougB@gorean.org) Received: from gorean.org (master [10.0.0.2]) by dt052n3e.san.rr.com (8.9.3/8.9.3) with ESMTP id OAA21535; Sat, 29 Jul 2000 14:49:45 -0700 (PDT) (envelope-from DougB@gorean.org) Message-ID: <39835178.FAD4AE8B@gorean.org> Date: Sat, 29 Jul 2000 14:49:44 -0700 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.73 [en] (Win98; U) X-Accept-Language: en MIME-Version: 1.0 To: "David J. Kanter" Cc: Forrest Aldrich , freebsd-questions@freebsd.org Subject: Re: Mergemaster usage References: <4.3.2.7.2.20000725160800.00c62310@64.20.73.233> <20000725212754.A66339@localhost.localdomain> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "David J. Kanter" wrote: > > On Tue, Jul 25, 2000 at 04:14:05PM -0400, Forrest Aldrich wrote: > > mergemaster > ---end quoted text--- > > Why don't you try this, more explicit, example. It's what I use: > > /usr/sbin/mergemaster -v -t /usr/tmp/root.$(DATE) -w 120 2>&1 | tee /usr/tmp/merge.$(DATE); > > It's from a Makefile posted on FreeBSD Diary, with some adjustments. Oh, > make sure /usr/tmp exists first. I have an alias for mergemaster: alias mergemaster='mergemaster -w ${COLUMNS}' But I use Bash, which does have the COLUMNS variable. I'm not sure if the csh variants do or not. > It'll take a few uses to become more comfortable with mergemaster, but once > you get it you'll be quite glad. Thank you. :) BTW, in reference to the original poster's question, the -a option "automatically" deletes files that are the same, and leaves the ones that are different behind for you to deal with as time permits. The easiest way to revisit them is by using the -r option. If you are updating several machines, you might consider tar'ing up your /etc/ directory and splashing it across your other installations. I keep options that are common to many machines in rc.conf, and options like hostname and IP in rc.conf.local. That way I only have to modify one file per machine. Keep in mind however that there are other items updated by mergemaster besides what's in /etc, so keep that in mind when you first do the update to see if there is anything else that you need to copy across machines. Good luck, Doug To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message