From owner-freebsd-current@FreeBSD.ORG Tue Jun 5 23:56:10 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1130516A400 for ; Tue, 5 Jun 2007 23:56:10 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: from ug-out-1314.google.com (ug-out-1314.google.com [66.249.92.172]) by mx1.freebsd.org (Postfix) with ESMTP id 6E9C013C447 for ; Tue, 5 Jun 2007 23:56:09 +0000 (UTC) (envelope-from yuri.pankov@gmail.com) Received: by ug-out-1314.google.com with SMTP id u2so358654uge for ; Tue, 05 Jun 2007 16:56:08 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:received:received:x-authentication-warning:date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=CBlr0fD3zkjzGOQ3UwGBi3/D2yrXehDxVAT6S3vtz0W3BcrboZpTFycW8cdRrb2ppB4nI63RsjBWJXIPCt/1eX+o7u9nq9jD0E4d228UMWPqcaPF9XpKxcD48s9SwuDPQYuRO4cbJBN+VaQD5bXnA0hVXKd9gPBI4Jd5lalwtc8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:x-authentication-warning:date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent; b=SlEuJGZhtEAP+gojiIHGUCA7QPfS+cZSGeJ1sd2Go94XrKsOAG7BuZoFXKy+uhSXSRvp1VaLN6o83it73b72VHHADF4SWJoSofjEoAWHO+KXK9Fg3/7jOtjQ/PM67RvDPErRSWU1U4stMXBYIpcVHc+v5dtRttSG2g2R/5hrOAk= Received: by 10.67.118.8 with SMTP id v8mr828803ugm.1181087768396; Tue, 05 Jun 2007 16:56:08 -0700 (PDT) Received: from darklight.abyss ( [194.186.18.2]) by mx.google.com with ESMTP id k30sm222823ugc.2007.06.05.16.56.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2007 16:56:07 -0700 (PDT) Received: from darklight.abyss (localhost [127.0.0.1]) by darklight.abyss (8.14.1/8.14.1) with ESMTP id l55NtmuC007896; Wed, 6 Jun 2007 03:55:48 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) Received: (from yuri@localhost) by darklight.abyss (8.14.1/8.14.1/Submit) id l55Ntkqu007895; Wed, 6 Jun 2007 03:55:46 +0400 (MSD) (envelope-from yuri.pankov@gmail.com) X-Authentication-Warning: darklight.abyss: yuri set sender to yuri.pankov@gmail.com using -f Date: Wed, 6 Jun 2007 03:55:45 +0400 From: Yuri Pankov To: Doug Barton Message-ID: <20070605235545.GA5658@darklight.abyss> References: <20070605182948.E31B845042@ptavv.es.net> <4665EDDE.90306@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4665EDDE.90306@FreeBSD.org> User-Agent: Mutt/1.5.15 (2007-04-06) Cc: freebsd-current@FreeBSD.org Subject: Re: xorg 7.2 & environment variables set in login.conf X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jun 2007 23:56:10 -0000 On Tue, Jun 05, 2007 at 04:12:30PM -0700, Doug Barton wrote: > Kevin Oberman wrote: > > >> I suppose the real moral to the story is: be very > >> careful what you overwrite during mergemaster. It's my > >> guess that I overwrote /etc/login.conf at some point > >> when my eyes were glassed over. > > mergemaster doesn't touch /etc/login.conf*, but that does not rule out > the "eyes glazed over" part. :) Sorry, but it does. FWIW: *** Displaying differences between ./etc/login.conf and installed version: --- /etc/login.conf Wed Jun 6 03:54:12 2007 +++ ./etc/login.conf Wed Jun 6 03:54:35 2007 @@ -7,7 +7,7 @@ # This file controls resource limits, accounting limits and # default user environment settings. # -# $FreeBSD: src/etc/login.conf,v 1.50 2005/08/31 15:02:11 keramida Exp $ +# $FreeBSD: src/etc/login.conf,v 1.51 2007/05/29 06:37:57 dougb Exp $ # > > > And 'mergemaster -U' is probably your best friend for letting you be > > very, very careful without spending all day doing the merge. > > I'm glad that people are finding this feature that Gordon added useful. > > Doug > > -- > Yuri