From owner-freebsd-stable  Wed Nov 12 21:32:53 1997
Return-Path: <owner-freebsd-stable>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.7/8.8.7) id VAA15834
          for stable-outgoing; Wed, 12 Nov 1997 21:32:53 -0800 (PST)
          (envelope-from owner-freebsd-stable)
Received: from shasta.wstein.com (joes@shasta.wstein.com [207.173.11.132])
          by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id VAA15826
          for <freebsd-stable@FreeBSD.ORG>; Wed, 12 Nov 1997 21:32:50 -0800 (PST)
          (envelope-from joes@shasta.wstein.com)
Received: (from joes@localhost)
	by shasta.wstein.com (8.8.8/8.8.8) id VAA02677;
	Wed, 12 Nov 1997 21:32:24 -0800 (PST)
From: Joseph Stein <joes@seaport.net>
Message-Id: <199711130532.VAA02677@shasta.wstein.com>
Subject: Re: Trying to upgrade: 2.1.7.1 to 2.2.5 (upgrading /etc)
In-Reply-To: <199711130356.NAA25461@ogre.dtir.qld.gov.au> from Stephen McKay at "Nov 13, 97 01:56:31 pm"
To: syssgm@dtir.qld.gov.au (Stephen McKay)
Date: Wed, 12 Nov 1997 21:32:23 -0800 (PST)
Cc: dhawk@river.org, freebsd-stable@FreeBSD.ORG, syssgm@dtir.qld.gov.au
X-Mailer: ELM [version 2.4ME+ PL31H (25)]
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-stable@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

> 6) update /etc from /usr/src/etc by hand, very carefully.

I've gotten pretty good at this.  I have been doing just '/usr/bin/time
make update world >& /usr/src/log& ; sleep 5 && tail -f /usr/src/log' but
recently started making update first, and then.... (drum roll, please)

-----
mkdir /var/tmp/n
cd /usr/src/etc
make distrib-dirs DESTDIR=/var/tmp/n
make distribution DESTDIR=/var/tmp/n
cd /var/tmp/n/etc
diff -r --paginate /etc . | lpr
-----

I don't update rc.conf (I use it stock, and override everything in 
/etc/rc.conf.local), so usually it is just a matter of copying over
and/or merging in the .conf files in the /etc directory (syslog.conf,
etc).

When the make world finishes, I make a new kernel, rebuild sendmail 
(I've got my own hacks built in), build Bind-8.1.1, and then, from
single user mode I ...

-----
mv /var/tmp/n/dev /
mv /var/tmp/n/etc /
-----

Works pretty well....