From owner-freebsd-questions@FreeBSD.ORG Wed Jan 7 06:13:46 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 02712106566B for ; Wed, 7 Jan 2009 06:13:46 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from mail-ew0-f21.google.com (mail-ew0-f21.google.com [209.85.219.21]) by mx1.freebsd.org (Postfix) with ESMTP id 544088FC1E for ; Wed, 7 Jan 2009 06:13:45 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: by ewy14 with SMTP id 14so9871960ewy.19 for ; Tue, 06 Jan 2009 22:13:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:received :x-authentication-warning:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=lrRGf0HvdjQ2nXekO9fbLbqqc1RKS3/LROAiOb2BYU0=; b=LvPPvajvQfyyUhiUTfDFWoATGqQTle99kmvJJUVouYr9IIXTKqTFVqpMIoVv3rchCg 2hJLtqP8/SbSyp2tguQn5Bx4aK0NJRCb0fc9/2NRtvfT39q59c3fdXelp51xzW0Xa+AZ Va43EehRltPKMcWoU3W/tMxkkjvAAZ2iGJgig= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=x-authentication-warning:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :in-reply-to:user-agent; b=iR+NxYP6JVmXRrhJk2rddZAOyJEy2kvCbsjlLpwBf2bvSna3EV1X2v8alXDEd67yhQ UVpnjiQAzOIcNVOvlfDw9Um2aXfYCAGs1Yfp4cYJt+kjFN6YwJCJ/PS7/dnk7Vgp2sEX FfgM9ercJFyOvH77f00wk+0UK/9dc7Yj91h1s= Received: by 10.210.89.13 with SMTP id m13mr1041085ebb.132.1231308824133; Tue, 06 Jan 2009 22:13:44 -0800 (PST) Received: from darklight.homeunix.org ([85.175.24.248]) by mx.google.com with ESMTPS id m5sm20683166gve.3.2009.01.06.22.13.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 06 Jan 2009 22:13:43 -0800 (PST) Received: from darklight.homeunix.org (yuri@darklight.homeunix.org [127.0.0.1]) by darklight.homeunix.org (8.14.3/8.14.3) with ESMTP id n076DekE068103; Wed, 7 Jan 2009 09:13:40 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.homeunix.org (8.14.3/8.14.3/Submit) id n076Ddc9068102; Wed, 7 Jan 2009 09:13:39 +0300 (MSK) (envelope-from yuri.pankov@gmail.com) X-Authentication-Warning: darklight.homeunix.org: yuri set sender to yuri.pankov@gmail.com using -f Date: Wed, 7 Jan 2009 09:13:39 +0300 From: Yuri Pankov To: Peter Boosten Message-ID: <20090107061339.GB12584@darklight.homeunix.org> References: <4964467D.9020606@boosten.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4964467D.9020606@boosten.org> User-Agent: Mutt/1.5.18 (2008-05-17) Cc: 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: Wed, 07 Jan 2009 06:13:46 -0000 On Wed, Jan 07, 2009 at 07:06:53AM +0100, Peter Boosten wrote: > Johann Hasselbach wrote: > > I was doing a src upgrade from 7.0 to 7.1 > > > > After installkernel, i rebooted, and accidently ran "mergemaster" > > instead of "mergemaster -p" before installworld. I ctrl-c'd once I > > realized what I had done, but the damage was done. > > > > It seems to have overwritten my password and group files. > > > > I've stated this before: In my opinion this entire 'I want to overwrite > your passwd file' attitude from mergemaster is nonsense: at installation > time you're required to add an additional user, and mergemaster wants to > undo that again. > > There are other ways to create new accounts or groups than simply > overwriting passwd/group files. > > Also: most scripts updated by mergemaster during 7.0->7.1 are only > version numbering diffs. Is there no smarter way to do this, apart from > typing 'i' every time? I think you want -U option (auto upgrade files that have not been modified by user) along with -i (install missing files). > > Having to go through mergemaster is the most tedious job I've ever done > (it would probably be bearable if only one machine was involved). > > > > > Did I damage anything else? > > You might wanna look at hosts, login.conf, ssh config, pam, audit, > sendmail, syslog.conf, basically everything in /etc. > > Peter > > -- > http://www.boosten.org Yuri