From owner-freebsd-stable@FreeBSD.ORG Tue May 5 21:57:51 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08D171065693 for ; Tue, 5 May 2009 21:57:51 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx23.fluidhosting.com [204.14.89.6]) by mx1.freebsd.org (Postfix) with ESMTP id 88ABC8FC1D for ; Tue, 5 May 2009 21:57:50 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 5875 invoked by uid 399); 5 May 2009 21:28:24 -0000 Received: from localhost (HELO 192.168.0.106) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 5 May 2009 21:28:24 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A00AF76.8010604@FreeBSD.org> Date: Tue, 05 May 2009 14:28:22 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (X11/20090423) MIME-Version: 1.0 To: Torfinn Ingolfsen References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> In-Reply-To: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2009 21:57:52 -0000 Torfinn Ingolfsen wrote: > Ok, this is strange. > > I just upgraded from 7.2-prerelease (as of 20090401) to 7.2-stable as > of today, using csup and building world. I've read this thread and find the whole thing very odd. In particular regarding your case, the last change to mergemaster was done on March 23rd, so if you updated a system on April 1st then again on May 4th you should have been using the same version of mergemaster. > As part of that process I did (as I always do) 'mergemaster -iU' after > the 'make installworld' step. > /etc/passwd (mergemaster sked about it, I pressed 'd', but it was still > upgraded, ugh!) > /etc/group (mergemaster sked about it, I pressed 'd', but it was still > upgraded, ugh!) That shouldn't even be possible. You have to affirmatively choose 'i' (for install) for it to be installed at all, the default is to leave it in the temproot directory. Additionally, the code to handle deleting is some of the oldest code in the script, and hasn't changed in over 8 years. I saw your followup message, can you please do me a favor and modify your /etc/motd file again, then run the following in a script(1) and send me the log? /bin/sh -x mergemaster -iU Thanks, Doug -- This .signature sanitized for your protection