Date: Thu, 11 Mar 2010 23:59:09 -0500 From: Steve Bertrand <steve@ibctech.ca> To: d@delphij.net Cc: freebsd-stable@freebsd.org, Xin LI <delphij@delphij.net> Subject: Re: I broke my SSH to jails after 7.2-8.0 src upgrade Message-ID: <4B99CA1D.4070905@ibctech.ca> In-Reply-To: <4B99C5FA.4020801@delphij.net> References: <4B99AAD3.9060606@ibctech.ca> <a78074951003111849m7f9aa56fkd4ec9bbafcd395ee@mail.gmail.com> <4B99B197.3060504@ibctech.ca> <4B99B2E2.6050705@ibctech.ca> <4B99BB0E.7080000@delphij.net> <4B99C270.9040703@ibctech.ca> <7d6fde3d1003112033k3ce3b040y8edac8772747862f@mail.gmail.com> <4B99C5FA.4020801@delphij.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4B99CA1D.4070905>