From e92c4f0a923ac9b396bf4274994c3d765549058b Mon Sep 17 00:00:00 2001 From: fbrehm Date: Sun, 19 Feb 2012 22:36:38 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 4 +++- config-archive/etc/conf.d/xdm | 11 +++++++++++ .../etc/conf.d/xdm.dist.new | 0 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 config-archive/etc/conf.d/xdm rename conf.d/._cfg0000_xdm => config-archive/etc/conf.d/xdm.dist.new (100%) diff --git a/.etckeeper b/.etckeeper index 282ebb1..b069354 100755 --- a/.etckeeper +++ b/.etckeeper @@ -166,7 +166,6 @@ maybe chmod 0644 './chromium/default' maybe chmod 0644 './colordiffrc' maybe chmod 0644 './colordiffrc-lightbg' maybe chmod 0755 './conf.d' -maybe chmod 0644 './conf.d/._cfg0000_xdm' maybe chmod 0644 './conf.d/alsasound' maybe chmod 0644 './conf.d/auditd' maybe chmod 0644 './conf.d/bootmisc' @@ -215,6 +214,9 @@ maybe chmod 0755 './config-archive/etc' maybe chmod 0755 './config-archive/etc/bash' maybe chmod 0644 './config-archive/etc/bash/bashrc' maybe chmod 0644 './config-archive/etc/bash/bashrc.dist.new' +maybe chmod 0755 './config-archive/etc/conf.d' +maybe chmod 0644 './config-archive/etc/conf.d/xdm' +maybe chmod 0644 './config-archive/etc/conf.d/xdm.dist.new' maybe chmod 0644 './config-archive/etc/hosts' maybe chmod 0644 './config-archive/etc/hosts.dist.new' maybe chmod 0755 './config-archive/etc/init.d' diff --git a/config-archive/etc/conf.d/xdm b/config-archive/etc/conf.d/xdm new file mode 100644 index 0000000..3b6c5c7 --- /dev/null +++ b/config-archive/etc/conf.d/xdm @@ -0,0 +1,11 @@ +# We always try and start X on a static VT. The various DMs normally default +# to using VT7. If you wish to use the xdm init script, then you should ensure +# that the VT checked is the same VT your DM wants to use. We do this check to +# ensure that you haven't accidentally configured something to run on the VT +# in your /etc/inittab file so that you don't get a dead keyboard. +CHECKVT=7 + +# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ] +# NOTE: If this is set in /etc/rc.conf, that setting will override this one. +#DISPLAYMANAGER="xdm" +DISPLAYMANAGER="gdm" diff --git a/conf.d/._cfg0000_xdm b/config-archive/etc/conf.d/xdm.dist.new similarity index 100% rename from conf.d/._cfg0000_xdm rename to config-archive/etc/conf.d/xdm.dist.new -- 2.39.5