From owner-freebsd-questions@FreeBSD.ORG Wed Jan 7 06:06:58 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 837521065672 for ; Wed, 7 Jan 2009 06:06:58 +0000 (UTC) (envelope-from peter@boosten.org) Received: from smtpq4.gn.mail.iss.as9143.net (smtpq4.gn.mail.iss.as9143.net [212.54.34.167]) by mx1.freebsd.org (Postfix) with ESMTP id 3DAB28FC16 for ; Wed, 7 Jan 2009 06:06:57 +0000 (UTC) (envelope-from peter@boosten.org) Received: from [212.54.34.139] (helo=smtp8.gn.mail.iss.as9143.net) by smtpq4.gn.mail.iss.as9143.net with esmtp (Exim 4.69) (envelope-from ) id 1LKRZA-0005yi-SK; Wed, 07 Jan 2009 07:06:56 +0100 Received: from [84.25.72.219] (helo=ra.egypt.nl) by smtp8.gn.mail.iss.as9143.net with esmtp (Exim 4.69) (envelope-from ) id 1LKRZ8-0007p5-Tv; Wed, 07 Jan 2009 07:06:54 +0100 Received: from [127.0.0.1] (xp.egypt.nl [192.168.13.35]) by ra.egypt.nl (Postfix) with ESMTP id 21D7D39C92; Wed, 7 Jan 2009 07:06:52 +0100 (CET) Message-ID: <4964467D.9020606@boosten.org> Date: Wed, 07 Jan 2009 07:06:53 +0100 From: Peter Boosten User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Johann Hasselbach References: In-Reply-To: X-Enigmail-Version: 0.95.7 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-ZiggoSMTP-MailScanner-Information: Please contact the ISP for more information X-ZiggoSMTP-MailScanner-ID: 1LKRZ8-0007p5-Tv X-ZiggoSMTP-MailScanner: Found to be clean X-ZiggoSMTP-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-1.913, required 5, BAYES_00 -2.60, SPF_NEUTRAL 0.69) X-ZiggoSMTP-MailScanner-From: peter@boosten.org X-Spam-Status: No Cc: freebsd-questions@freebsd.org 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:06:58 -0000 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? 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