From: fbrehm <fbrehm@samara.profitbricks.localdomain>
Date: Sun, 19 Feb 2012 21:36:38 +0000 (+0100)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=e92c4f0a923ac9b396bf4274994c3d765549058b;p=config%2Fsamara%2Fetc.git

saving uncommitted changes in /etc prior to emerge run
---

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/conf.d/._cfg0000_xdm b/conf.d/._cfg0000_xdm
deleted file mode 100644
index c82fece..0000000
--- a/conf.d/._cfg0000_xdm
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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"
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/config-archive/etc/conf.d/xdm.dist.new b/config-archive/etc/conf.d/xdm.dist.new
new file mode 100644
index 0000000..c82fece
--- /dev/null
+++ b/config-archive/etc/conf.d/xdm.dist.new
@@ -0,0 +1,10 @@
+# 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"