freebsd-update

[doug]

On Sun, 26 Aug 2012, Walter Hurry wrote:

> On Sun, 26 Aug 2012 14:24:34 -0400, doug wrote:
>
>> In doing an update from 8.3 --> 9.0 I messed up the merge on /etc/ttys.
>> This has interesting consequences BTW. Are there any docs on how to do
>> this?
>
> Here's mine. Note: I changed ttyv8 from off to on as I am using xdm.
>
> console none                            unknown off secure
> #
> ttyv0   "/usr/libexec/getty Pc"         xterm   on  secure
> # Virtual terminals
> ttyv1   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv2   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv3   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv4   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv5   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv6   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv7   "/usr/libexec/getty Pc"         xterm   on  secure
> ttyv8   "/usr/local/bin/xdm -nodaemon"  xterm   on  secure
> # Serial terminals
> # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
> ttyu0   "/usr/libexec/getty std.9600"   dialup  off secure
> ttyu1   "/usr/libexec/getty std.9600"   dialup  off secure
> ttyu2   "/usr/libexec/getty std.9600"   dialup  off secure
> ttyu3   "/usr/libexec/getty std.9600"   dialup  off secure
> # Dumb console
> dcons   "/usr/libexec/getty std.9600"   vt100   off secure
> (END)
>
So with something like:

[the beginning of my file]
<<<<<<< current version
PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin
HOME=/var/log
=======
PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
>>>>>>> 8.0-RELEASE
[the rest of my file]

just delete the stuff after "=======" ??