From owner-freebsd-stable@FreeBSD.ORG Fri Mar 12 04:33:30 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 4D5291065673 for ; Fri, 12 Mar 2010 04:33:30 +0000 (UTC) (envelope-from yanefbsd@gmail.com) Received: from mail-pw0-f54.google.com (mail-pw0-f54.google.com [209.85.160.54]) by mx1.freebsd.org (Postfix) with ESMTP id 21A6A8FC1C for ; Fri, 12 Mar 2010 04:33:29 +0000 (UTC) Received: by pwj4 with SMTP id 4so488345pwj.13 for ; Thu, 11 Mar 2010 20:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=u2EuJTlFdT4Yf4LfBs+h0JCtamC9W6RNMf9BDYTPgoM=; b=NUd3RBM4KV+ZXiWUo0QrQU4D8TBy60tBDuJZsTLR+cRhhRiOYkYKJDUQnF82WVF7na yTf3OuBflFo5kn6dz4HMhxDPqEQhqamY74LdLBmIGUo6+nZ4QPE2aY/r1B/kUJnisHuz n7Z/KtebRqY80kXgkp0Cj0oCMpnQ1aSS6joC0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=brW1bQLyZtmWosaOfoVKhErqxa8hjZskkVPmPw50bc5Ly51Pn2oCXH5g7+f8fXnqlC lWflzuZ92z9VaZgag7ATdEPJX/neb1VyOLThmRz44x3JeXLcs/DRmA5Q0nlvhrJ1vsHb 9r1tS/pRnsmJSltdE67XTQu8xEwZ+zCdJpVPM= MIME-Version: 1.0 Received: by 10.143.27.20 with SMTP id e20mr2033530wfj.256.1268368409498; Thu, 11 Mar 2010 20:33:29 -0800 (PST) In-Reply-To: <4B99C270.9040703@ibctech.ca> References: <4B99AAD3.9060606@ibctech.ca> <4B99B197.3060504@ibctech.ca> <4B99B2E2.6050705@ibctech.ca> <4B99BB0E.7080000@delphij.net> <4B99C270.9040703@ibctech.ca> Date: Thu, 11 Mar 2010 20:33:29 -0800 Message-ID: <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> From: Garrett Cooper To: Steve Bertrand Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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:33:30 -0000 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... =A0What >> does 'ident /etc/defaults/devfs.rules' show? > > ...not necessarily 8_0: > > %grep tag /etc/supfile > > *default tag=3DRELENG_8 > > fwiw: > > %ident /etc/defaults/devfs.rules > > /etc/defaults/devfs.rules: > =A0 =A0 $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: -a Run automatically. This option will leave all the files t= hat differ from the installed versions in the temporary direct= ory to be dealt with by hand. If the temproot directory exist= s, it creates a new one in a previously non-existent director= y. 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. Thanks, -Garrett