From owner-freebsd-questions@FreeBSD.ORG  Sun Aug 26 20:49:34 2012
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3C261065688
	for <freebsd-questions@freebsd.org>;
	Sun, 26 Aug 2012 20:49:33 +0000 (UTC)
	(envelope-from doug@fledge.watson.org)
Received: from fledge.watson.org (fledge.watson.org [65.122.17.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A4C218FC0C
	for <freebsd-questions@freebsd.org>;
	Sun, 26 Aug 2012 20:49:33 +0000 (UTC)
Received: from fledge.watson.org (localhost.watson.org [127.0.0.1])
	by fledge.watson.org (8.14.5/8.14.5) with ESMTP id q7QKnWIL082759;
	Sun, 26 Aug 2012 16:49:32 -0400 (EDT)
	(envelope-from doug@fledge.watson.org)
Received: from localhost (doug@localhost)
	by fledge.watson.org (8.14.5/8.14.5/Submit) with ESMTP id
	q7QKnW2x082756; Sun, 26 Aug 2012 16:49:32 -0400 (EDT)
	(envelope-from doug@fledge.watson.org)
Date: Sun, 26 Aug 2012 16:49:32 -0400 (EDT)
From: doug <doug@fledge.watson.org>
To: Walter Hurry <walterhurry@gmail.com>
In-Reply-To: <k1dv8c$qai$1@ger.gmane.org>
Message-ID: <alpine.BSF.2.00.1208261647360.56052@fledge.watson.org>
References: <alpine.BSF.2.00.1208261422450.56052@fledge.watson.org>
	<k1dv8c$qai$1@ger.gmane.org>
User-Agent: Alpine 2.00 (BSF 1167 2008-08-23)
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.3
	(fledge.watson.org [127.0.0.1]);
	Sun, 26 Aug 2012 16:49:32 -0400 (EDT)
Cc: freebsd-questions@freebsd.org
Subject: Re: freebsd-update
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: doug@safeport.com
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
	<mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Aug 2012 20:49:34 -0000

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 "=======" ??