diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-04-20 06:37:42 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-04-20 06:37:42 +0000 |
| commit | 7af65b3e4d49ab51ab6046d7631368c09ad4e213 (patch) | |
| tree | 17de086e0a123945442c861d11b6c3d5007abc6b /x11-apps/xinit | |
| parent | (#10486) Don't run Xwilling script as the nobody user, /bin/false can't run a... (diff) | |
| download | gentoo-2-7af65b3e4d49ab51ab6046d7631368c09ad4e213.tar.gz gentoo-2-7af65b3e4d49ab51ab6046d7631368c09ad4e213.tar.bz2 gentoo-2-7af65b3e4d49ab51ab6046d7631368c09ad4e213.zip | |
Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though rc.conf is deprecated.
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm.confd | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index b38bf828ea73..d5540e781158 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.44 2006/04/20 06:28:30 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.45 2006/04/20 06:37:42 spyderous Exp $ + + 20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.confd: + Add a note that rc.conf overrides this DISPLAYMANAGER setting, even though + rc.conf is deprecated. *xinit-1.0.2-r2 (20 Apr 2006) diff --git a/x11-apps/xinit/files/xdm.confd b/x11-apps/xinit/files/xdm.confd index 53f310d77f16..e6d69799637c 100644 --- a/x11-apps/xinit/files/xdm.confd +++ b/x11-apps/xinit/files/xdm.confd @@ -6,4 +6,5 @@ XSTATICVT="yes" # What display manager do you use ? [ xdm | gdm | kdm | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. DISPLAYMANAGER="xdm" |