I broke my SSH to jails after 7.2-8.0 src upgrade

[Xin LI]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

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?

Cheers,
- -- 
Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!	       Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (FreeBSD)

iQEcBAEBAgAGBQJLmcX6AAoJEATO+BI/yjfB4lgIAKF4XMGFSU0VsvmfUD2WIWoE
N5UQTKiew4cyytk80SS0ProGemMnWykAfZIDyhovCxp7WRAPJMmrqhulcYXHi+hW
DBP4Dx8AsHu/pQ0edauIfnEXYy4gd9g9D6yRIS8407izYTPYs1FvfW0GeftLwEfn
Ngm/bYggw1g/Nc5ercqc3AV1vXJJSZ6c3VL8r1ohlsiCRlybMaXBxQrU/KSjDFoz
/xI4TOJ5+L+gCpfFB8Tvso8IueZ/YqVSPKnC95bOwGR16sERmACZ7rRUIg7zXyhA
VhKttjqfLrHRn6yp905OvS3rkmtCWBfpqIM8Ia34owjSlZbTUK7i0phiDw3uADE=
=IXRh
-----END PGP SIGNATURE-----