From owner-freebsd-current@FreeBSD.ORG Mon Feb 7 20:34:06 2005 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D112316A4CE for ; Mon, 7 Feb 2005 20:34:06 +0000 (GMT) Received: from smtp3.server.rpi.edu (smtp3.server.rpi.edu [128.113.2.3]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7455E43D49 for ; Mon, 7 Feb 2005 20:34:06 +0000 (GMT) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by smtp3.server.rpi.edu (8.13.0/8.13.0) with ESMTP id j17KY0QB023386; Mon, 7 Feb 2005 15:34:00 -0500 Mime-Version: 1.0 Message-Id: In-Reply-To: <20050207.101739.16679956.imp@bsdimp.com> References: <200502070810.53809.jonathan@fosburgh.org> <20050207.101739.16679956.imp@bsdimp.com> Date: Mon, 7 Feb 2005 15:33:59 -0500 To: "M. Warner Losh" , jonathan@fosburgh.org From: Garance A Drosihn Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-CanItPRO-Stream: default X-RPI-SA-Score: undef - spam-scanning disabled X-Scanned-By: CanIt (www . canit . ca) cc: current@freebsd.org Subject: Re: 5-STABLE to 6-CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Feb 2005 20:34:06 -0000 At 10:17 AM -0700 2/7/05, M. Warner Losh wrote: >In message: <200502070810.53809.jonathan@fosburgh.org> > Jonathan Fosburgh writes: >: /usr/src/UPDATING doesn't seem too clear on this, and I can't >: find it in the mailing lists. What is the current procedure to >: upgrade from 5-STABLE to 6-CURRENT? > >Here's what I have in my tree, waiting to be committed. I've >simplified out all the 4.x stuff since people still running 4.x >should consider upgrading to 5.3 first. As such, I've removed >all the work arounds for an imperfect evolution of the system. > > To upgrade in-place from 5.x-stable to current > ---------------------------------------------- > > make buildworld [9] > make kernel KERNCONF=YOUR_KERNEL_HERE [8] > [1] > [3] > mergemaster -p [5] I find it easier/nicer to do the 'mergemaster -p' step before rebooting into single-user mode... That's at least partially because I'm trying to keep accounts in-sync across multiple machines. On the other hand, I don't see any advantage in waiting to do that step after the reboot. > [3] From the bootblocks, boot -s, and then do > fsck -p > mount -u / > mount -a > cd src > adjkerntz -i # if CMOS is wall time > Also, when doing a major release upgrade, it is required that > you boot into single user mode to do the installworld. To me, it seemed like a good idea to put all these steps (and a few others) in a source-file under /root. That way I only have to type in one thing -- and I'm much less tempted to try short-cuts if there is only one thing to type in. What is that 'cd src' doing in there? What causes you to be in /usr at that step? I'm pretty sure that I'm in / or /root. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu