From owner-freebsd-stable@FreeBSD.ORG Fri Mar 12 04:59:13 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 563A01065670 for ; Fri, 12 Mar 2010 04:59:13 +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 E8EED8FC08 for ; Fri, 12 Mar 2010 04:59:12 +0000 (UTC) Received: (qmail 82980 invoked by uid 89); 12 Mar 2010 04:58:25 -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:58:25 -0000 Message-ID: <4B99CA1D.4070905@ibctech.ca> Date: Thu, 11 Mar 2010 23:59:09 -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: d@delphij.net 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> <4B99C5FA.4020801@delphij.net> In-Reply-To: <4B99C5FA.4020801@delphij.net> X-Enigmail-Version: 1.0.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org, 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:59:13 -0000 On 2010.03.11 23:41, Xin LI wrote: > On 2010/03/11 20:33, Garrett Cooper wrote: >> 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: > >> -a Run automatically. This option will leave all the files that >> differ from the installed versions in the temporary directory >> to be dealt with by hand. If the temproot directory exists, >> it creates a new one in a previously non-existent directory. >> This option unsets the verbose flag, but other than -U it is >> compatible with all other options. Setting -a makes -w >> superfluous. > >> Also, "add path pts unhide" unmasks all psuedo TTY dev nodes so that >> applications that use openpty(3) and friends (like sshd) can allocate >> them at login. > > Yes that's right. Thanks for posting, perhaps we can document it in FAQ? Well, if anything, the FAQ should simply say "read the damn handbook and follow it". If I had of followed the same procedure that I've been using for the last 7 years (at least) instead of trying to 'automate' (-a) prior to reading the man page thoroughly, I would have been ok. Sorry for the noise, but thanks for the help ;) Cheers, Steve