From owner-freebsd-questions  Wed Feb 13  9:59:43 2002
Delivered-To: freebsd-questions@freebsd.org
Received: from sage-american.com (sage-american.com [216.122.141.44])
	by hub.freebsd.org (Postfix) with ESMTP id 703CB37B400
	for <freebsd-questions@FreeBSD.ORG>; Wed, 13 Feb 2002 09:59:37 -0800 (PST)
Received: from SAGEONE (adsl-64-219-30-1.dsl.crchtx.swbell.net [64.219.30.1])
	by sage-american.com (8.9.3/8.9.3) with SMTP id LAA26357;
	Wed, 13 Feb 2002 11:59:31 -0600 (CST)
Message-Id: <3.0.5.32.20020213115930.0196bec8@mail.sage-american.com>
X-Sender: jacks@mail.sage-american.com
X-Mailer: QUALCOMM Windows Eudora Pro Version 3.0.5 (32)
Date: Wed, 13 Feb 2002 11:59:30 -0600
To: "B.K. DeLong" <bkdelong@pobox.com>, freebsd-questions@FreeBSD.ORG
From: jacks@sage-american.com
Subject: Re: Using MergeMaster/ Release-to-Stable Process?
In-Reply-To: <5.1.0.14.2.20020213124225.01bd2ec0@pop.earthlink.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-questions.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-questions>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-questions>
X-Loop: FreeBSD.ORG

Oh, on the reboot... you should be dropping to single user before
installworld....

At 12:49 PM 2.13.2002 -0500, B.K. DeLong wrote:
>Hey all -
>
>I'm currently biding my time while a "make buildworld" completes after 
>doing a cvsup of 4.5. Previous to this install, I had 4.4 and when I 
>completed all the various make commands, I ran mergemaster.
>
>I haven't the slightest clue of how mergemaster works and whether I should 
>be merging sources, deleting them or inserting them. Last time I just 
>"saved it for later" and did nothing.
>
>Does anyone have a good guide or tips to using mergemaster? Should I just 
>merge the new stuff? Insert it?
>
>Also, here's the process I'm using. Is this right?
>
>1. cvsup /etc/stable-supfile
>2. make buildworld
>3. make installworld
>4. make buildkernel KERNCONF=FIREWALL
>5. make installkernel KERNCONF=FIREWALL
>6. mergemaster (what to do when I run it??)
>7. make clean
>
>* Do I need KERNCONF for 2 or 3?
>*Does "make clean" get rid of unneeded files from this process? Or should I 
>delete something? Last time I did the cvsup and all the makes plus 
>mergemaster I ended up filling /usr with 1GB of stuff
>
>*Is there any place in the above procedure I should be rebooting?
>
>Thanks in advance for any help and advice.
>
>
>
>--
>B.K. DeLong
>bkdelong@pobox.com
>617.877.3271
>
>http://www.brain-stream.com               Play.
>http://www.the-leaky-cauldron.org        Potter.
>http://www.attrition.org                       Security.
>http://www.artemisiabotanicals.com     Herb.
>
>
>To Unsubscribe: send mail to majordomo@FreeBSD.org
>with "unsubscribe freebsd-questions" in the body of the message
>
>

Best regards,
Jack L. Stone,
Server Admin

===================================================
Sage-American 
http://www.sage-american.com
jacks@sage-american.com

"My center is giving way, my right is in retreat;
....situation excellent! ....I shall attack!"
===================================================

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message