From owner-freebsd-stable@FreeBSD.ORG Fri Mar 12 04:45:52 2010 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 036DB1065670 for ; Fri, 12 Mar 2010 04:45:52 +0000 (UTC) (envelope-from steve@ibctech.ca) Received: from smtp.ibctech.ca (v6.ibctech.ca [IPv6:2607:f118::b6]) by mx1.freebsd.org (Postfix) with SMTP id 9521D8FC1E for ; Fri, 12 Mar 2010 04:45:51 +0000 (UTC) Received: (qmail 82471 invoked by uid 89); 12 Mar 2010 04:45:06 -0000 Received: from unknown (HELO ?192.168.1.114?) (steve@ibctech.ca@::ffff:208.70.104.100) by ::ffff:208.70.104.210 with ESMTPA; 12 Mar 2010 04:45:06 -0000 Message-ID: <4B99C6FE.7040801@ibctech.ca> Date: Thu, 11 Mar 2010 23:45:50 -0500 From: Steve Bertrand User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20100111 Lightning/1.0b1 Thunderbird/3.0.1 MIME-Version: 1.0 To: Garrett Cooper References: <4B99AAD3.9060606@ibctech.ca> <4B99B197.3060504@ibctech.ca> <4B99B2E2.6050705@ibctech.ca> <4B99BB0E.7080000@delphij.net> <4B99C270.9040703@ibctech.ca> <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> In-Reply-To: <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org, d@delphij.net, Xin LI Subject: Re: I broke my SSH to jails after 7.2-8.0 src upgrade 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: Fri, 12 Mar 2010 04:45:52 -0000 On 2010.03.11 23:33, Garrett Cooper wrote: > On Thu, Mar 11, 2010 at 8:26 PM, Steve Bertrand wrote: >> On 2010.03.11 22:54, Xin LI wrote: >>> Weird, it seems that RELENG_8_0 do contain the correct file... What >>> does 'ident /etc/defaults/devfs.rules' show? >> >> ...not necessarily 8_0: >> >> %grep tag /etc/supfile >> >> *default tag=RELENG_8 >> >> fwiw: >> >> %ident /etc/defaults/devfs.rules >> >> /etc/defaults/devfs.rules: >> $FreeBSD: src/etc/defaults/devfs.rules,v 1.4.2.1.6.1 2009/04/15 >> 03:14:26 kensmith Exp $ >> >> ...again... perhaps my arg list to mergemaster was the issue. If it was, >> it would be good to know ;) >> >> Otherwise, it was a standard src upgrade. >> >> Let me know if you need anything further. I can simulate the procedure >> on other hardware tomorrow to isolate the issue if you feel that this >> may affect others, or if it can prove that I was just sleeping on the job. > > I've done a few RELENG_8_0 to STABLE-8 to 9-CURRENT upgrades lately > and mergemaster was goofing up the contents a bit based on the RCS > versions. I had to hand-edit a crapload of stuff going from 8 to 9, > and I still don't trust mergemaster's automatic merging logic because > it goofs up on /etc/group // /etc/passwd still (doesn't merge > anything, discards my info, etc) for starters. > > -a doesn't actually do any merging though, FWIW: heh. Then this explains it. ...at least my own idiocy (or perhaps lack thereof for trying too hard) keeps me at the OS troubleshooting level ;) So long as the OS I'm troubleshooting doesn't have a gui, I'm ok with it. I'm obviously going to get a better understanding of mergemaster. More importantly, I have a colleague who wanted to help this afternoon, but I didn't know how to describe the problem. This thread will help. Thanks! Steve