xorg 7.2 & environment variables set in login.conf

[Yuri Pankov]

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:

<snip>
  *** 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 $
 #
<snip>

> 
> > 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