From owner-freebsd-stable@FreeBSD.ORG Wed May 6 16:45:02 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 2C2141065687 for ; Wed, 6 May 2009 16:45:02 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) Received: from osl1smout1.broadpark.no (osl1smout1.broadpark.no [80.202.4.58]) by mx1.freebsd.org (Postfix) with ESMTP id DB7828FC41 for ; Wed, 6 May 2009 16:45:01 +0000 (UTC) (envelope-from torfinn.ingolfsen@broadpark.no) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=US-ASCII Received: from osl1sminn1.broadpark.no ([80.202.4.59]) by osl1smout1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with ESMTP id <0KJ800F35EJ03D80@osl1smout1.broadpark.no> for freebsd-stable@freebsd.org; Wed, 06 May 2009 18:45:00 +0200 (CEST) Received: from kg-v2.kg4.no ([80.202.83.38]) by osl1sminn1.broadpark.no (Sun Java(tm) System Messaging Server 6.3-3.01 (built Jul 12 2007; 32bit)) with SMTP id <0KJ8002GSEJ0O8E0@osl1sminn1.broadpark.no> for freebsd-stable@freebsd.org; Wed, 06 May 2009 18:45:00 +0200 (CEST) Date: Wed, 06 May 2009 18:45:00 +0200 From: Torfinn Ingolfsen To: freebsd-stable@freebsd.org Message-id: <20090506184500.70b2c6f2.torfinn.ingolfsen@broadpark.no> In-reply-to: <4A00AF76.8010604@FreeBSD.org> References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <4A00AF76.8010604@FreeBSD.org> X-Mailer: Sylpheed 2.6.0 (GTK+ 2.16.1; amd64-portbld-freebsd7.2) X-Face: "t9w2,-X@O^I`jVW\sonI3.,36KBLZE*AL[y9lL[PyFD*r_S:dIL9c[8Y>V42R0"!"yb_zN,f#%.[PYYNq; m"_0v; ~rUM2Yy!zmkh)3&U|u!=T(zyv,MHJv"nDH>OJ`t(@mil461d_B'Uo|'nMwlKe0Mv=kvV?Nh@>Hb<3s_z2jYgZhPb@?Wi^x1a~Hplz1.zH 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: Wed, 06 May 2009 16:45:05 -0000 On Tue, 05 May 2009 14:28:22 -0700 Doug Barton wrote: > I've read this thread and find the whole thing very odd. In particular I agree - it is odd. I have a few more machines to upgrade in the coming weeks - if anyone have a better testcase to find out what is going on, I'm ready for it. > 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. Well, something has changed in the way mergemaster handles this, unless there is something else in the make world procedure that updates files in /etc? To be clear, I follow this procedure: 1. make buildworld 2. make kernel 3. shutdown now 4. mergemaster -p 5. make installworld 6. mergemaster -iU 7. fastboot > 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 Done - sent in personal mail. HTH -- Regards, Torfinn Ingolfsen