From owner-freebsd-current@FreeBSD.ORG Thu Jul 26 13:47:39 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C862E16A418 for ; Thu, 26 Jul 2007 13:47:39 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from cain.gsoft.com.au (cain.gsoft.com.au [203.31.81.10]) by mx1.freebsd.org (Postfix) with ESMTP id 1A5DB13C4B3 for ; Thu, 26 Jul 2007 13:47:38 +0000 (UTC) (envelope-from doconnor@gsoft.com.au) Received: from inchoate.gsoft.com.au (ppp121-45-48-57.lns11.adl2.internode.on.net [121.45.48.57]) (authenticated bits=0) by cain.gsoft.com.au (8.13.8/8.13.8) with ESMTP id l6QDlWbX088822 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 26 Jul 2007 23:17:34 +0930 (CST) (envelope-from doconnor@gsoft.com.au) From: "Daniel O'Connor" To: freebsd-current@freebsd.org Date: Thu, 26 Jul 2007 23:17:28 +0930 User-Agent: KMail/1.9.7 References: <8cdf6c720707070710k2b7e030v37683e460d983bf9@mail.gmail.com> <4690CFAA.30004@gmail.com> <20070726081324.GA2503@obiwan.tataz.chchile.org> In-Reply-To: <20070726081324.GA2503@obiwan.tataz.chchile.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart2523710.tt8Rfb7lKx"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200707262317.29530.doconnor@gsoft.com.au> X-Spam-Score: -2.312 () BAYES_00 X-Scanned-By: MIMEDefang 2.58 on 203.31.81.10 Cc: Marc UBM Bocklet , Jeremie Le Hen , Rene Ladan Subject: Re: status of 7.0 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 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: Thu, 26 Jul 2007 13:47:39 -0000 --nextPart2523710.tt8Rfb7lKx Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thu, 26 Jul 2007, Jeremie Le Hen wrote: > > configuaration option, it shouldn't be necessary to rebuild all > > your ports. > > I'd like to add that whenever I performed an upgrade between two > FreeBSD major branch I found easier to use sysutils/etcmerge than > mergemaster(8) to upgrade /etc, as the former is far more automated > and prevents a lot of work due to the huge number of changes to > merge. > > Important note (also explained in the "ROUGH DESCRIPTION OF USE" part > of etcmerge manpage): > 1) Make sure your current /etc is up-to-date (IOW run mergemaster(8)) > WRT your current RELENG_6 source tree; > 2) Follow etcmerge manpage to get /var/db/etc corresponding to the > _stock_ /etc directory from your source tree. etcmerge is nice, although I have found it does try to merge the .db=20 files which result in bogus conflicts (just delete the .db files and=20 rebuild the alias, password and/or terminal cap. DB). It's also nice because it doesn't touch your /etc until after everything=20 is merged. =2D-=20 Daniel O'Connor software and network engineer for Genesis Software - http://www.gsoft.com.au "The nice thing about standards is that there are so many of them to choose from." -- Andrew Tanenbaum GPG Fingerprint - 5596 B766 97C0 0E94 4347 295E E593 DC20 7B3F CE8C --nextPart2523710.tt8Rfb7lKx Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (FreeBSD) iD8DBQBGqKXx5ZPcIHs/zowRAgEyAJ9eL7RGe25Fg/ej/lGav1GILVVGwgCgo39m 6tgPPvH5Zm0aeg4gre1cb64= =Q92l -----END PGP SIGNATURE----- --nextPart2523710.tt8Rfb7lKx--