From owner-freebsd-questions@FreeBSD.ORG Thu Jan 8 23:08:28 2009 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 172591065782 for ; Thu, 8 Jan 2009 23:08:28 +0000 (UTC) (envelope-from kitchetech@gmail.com) Received: from mail-bw0-f20.google.com (mail-bw0-f20.google.com [209.85.218.20]) by mx1.freebsd.org (Postfix) with ESMTP id 627668FC13 for ; Thu, 8 Jan 2009 23:08:26 +0000 (UTC) (envelope-from kitchetech@gmail.com) Received: by bwz13 with SMTP id 13so1705019bwz.19 for ; Thu, 08 Jan 2009 15:08:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type:references; bh=7PifqKxvf+6geVa+nX/R3dPKexYipEOpkHnpJlrFjOg=; b=QVoMUTr32KBiRNFWFNwQNcNPSiHMtZhVzupCg8COhrrLK64e1hDBjE14W42PLDl6yn xKWXLDNZaOMdnqdCCZJ8WhUJOHWEUBJuKL84zKA6N2gFGHINaSeabDty4JTEPE0ydfN0 ysHiSlmjX9dcdv4ICHxWPPSemXVWaTlVLVeYI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:references; b=oVLBJTbI+2rq8PVz6ojLWZ2tegOeUI/WbVxTzOz6W8+4vEJdEAFKb0qFE+dHPn99Xl gdnqUpIQguQ4k76HYEw9dJcTCZoyU7twYGrwtc2P6dG3PgnZejM1RAK3IPKB/mYKqKMI 9uoASG1BB9ifsPvPPC7OEqpj+oUll4PRMbITc= Received: by 10.181.235.6 with SMTP id m6mr8881044bkr.190.1231456106109; Thu, 08 Jan 2009 15:08:26 -0800 (PST) Received: by 10.181.14.6 with HTTP; Thu, 8 Jan 2009 15:08:26 -0800 (PST) Message-ID: <28283d910901081508q3647fe7frde85ec609518bcfe@mail.gmail.com> Date: Thu, 8 Jan 2009 18:08:26 -0500 From: "matt donovan" To: "Peter Boosten" In-Reply-To: <4965793F.3060202@boosten.org> MIME-Version: 1.0 References: <4964467D.9020606@boosten.org> <20090107202206.GK99261@obspm.fr> <496511DE.2040001@boosten.org> <28283d910901071718m1b71eb41r22f9787d968802b@mail.gmail.com> <4965793F.3060202@boosten.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Albert.Shih@obspm.fr, freebsd-questions@freebsd.org, Johann Hasselbach Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jan 2009 23:08:28 -0000 On Wed, Jan 7, 2009 at 10:55 PM, Peter Boosten wrote: > matt donovan wrote: > > On Wed, Jan 7, 2009 at 3:34 PM, Peter Boosten wrote: > >>> > >> Well, my point is that mergemaster shouldn't have to delete ALL > accounts, > >> just to add one. User and group accounts can be added to the > passwd/group > >> file *without* deleting the others. > >> > > > > mergemaster doesn't delete ALL accounts if you do it correctly. I usually > > leave the files for later and then manually do it. > > > > Your 'do it correctly' refers to 'leave it for later', however I've read > at least twice yesterday, that someone *accidentally* 'installed' the > file from /var/tmp/temproot. *That* should not be possible in the first > place. > > Thank heaven it never happened to me (knock on wood), but a mistake is > easily made, especially when you just went through a whole bunch of > updated rc scripts. > > Peter > > -- > http://www.boosten.org > myself I just watch the file name line since I don't touch files outside of /usr. unless it's for example ppp.conf