From owner-freebsd-audit@FreeBSD.ORG Wed Jan 12 21:41:45 2005 Return-Path: Delivered-To: freebsd-audit@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 28D2C16A4CE; Wed, 12 Jan 2005 21:41:45 +0000 (GMT) Received: from odin.ac.hmc.edu (Odin.AC.HMC.Edu [134.173.32.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBD8843D31; Wed, 12 Jan 2005 21:41:44 +0000 (GMT) (envelope-from brdavis@odin.ac.hmc.edu) Received: from odin.ac.hmc.edu (localhost.localdomain [127.0.0.1]) by odin.ac.hmc.edu (8.13.0/8.13.0) with ESMTP id j0CLifwb023692; Wed, 12 Jan 2005 13:44:41 -0800 Received: (from brdavis@localhost) by odin.ac.hmc.edu (8.13.0/8.13.0/Submit) id j0CLifPc023691; Wed, 12 Jan 2005 13:44:41 -0800 Date: Wed, 12 Jan 2005 13:44:41 -0800 From: Brooks Davis To: Garance A Drosihn Message-ID: <20050112214441.GB21038@odin.ac.hmc.edu> References: <20050112135336.GC68344@heechee.tobez.org> <20050112211737.GB15577@heechee.tobez.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="CUfgB8w4ZwR/yMy5" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.1i X-Virus-Scanned: by amavisd-new X-Spam-Status: No, hits=0.0 required=8.0 tests=none autolearn=no version=2.63 X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on odin.ac.hmc.edu cc: DougB@freebsd.org cc: Anton Berezin cc: freebsd-audit@freebsd.org Subject: Re: [PATCH] review requested, add a feature to mergemaster X-BeenThere: freebsd-audit@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: FreeBSD Security Audit List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Jan 2005 21:41:45 -0000 --CUfgB8w4ZwR/yMy5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jan 12, 2005 at 04:35:45PM -0500, Garance A Drosihn wrote: > At 10:17 PM +0100 1/12/05, Anton Berezin wrote: > >On Wed, Jan 12, 2005, Garance A Drosihn wrote: > > > At 2:53 PM +0100 1/12/05, Anton Berezin wrote: > > > > > >> >A new option is added: > >> > > >> > -R cvsroot For files that contain a $FreeBSD$ string, > > > > >> Hmm. I'm not sure how useful this will be (not that I object > > > to it in anyway, I'm just not sure...). >=20 >=20 > >A single, probably not very useful datapoint: install 5.3-RELEASE, > >cvsup to RELENG_5, {build,install}{world,kernel}, then do mergemaster. > >This currently leads to about 20 cases of "pointless diffs", all of > >which go away when using this option. >=20 > I understand the desired goal. I'm just not sure that this > option will be generally useful. >=20 > >If a concern is that only a minority of machines have /home/ncvs > >installed, then the answer would be that "cvsroot" is a generic > >string, which can be anything cvs -d accepts, meaning that > >various :pserver: and :ext:-based solutions shall work. >=20 > If a user is following the rules for upgrading, then the really > important mergemaster run is done in single-user mode. You do > not have networking, you do not have NFS, you do not even have the > any value set for `hostname`. Thus, if that user does not have > the cvs repository on their local hard disk, then this option will > require several additional steps (and those steps may not be > convenient, particularly for someone who gets their network > address via DHCP). Given the existance of /etc/netstart, I don't think this is a big deal. In any case, there is rairly a need to actually do mergemaster in single user mode except on production servers. -- Brooks --=20 Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 --CUfgB8w4ZwR/yMy5 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFB5ZpIXY6L6fI4GtQRAtbkAKDNlWA0oiQ42V0ObfBxd1+sXVQeTwCfVOyI 8H69aJ9GUV6BTpcR/d2o86M= =YMQr -----END PGP SIGNATURE----- --CUfgB8w4ZwR/yMy5--