From: frank <frank@bruni.home.brehm-online.com>
Date: Fri, 8 Jun 2012 05:07:28 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to emerge run
X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=72d03903f02855f72a24a31129b463ca2f2f80bb;p=config%2Fbruni%2Fetc.git

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

diff --git a/conf.d/._cfg0000_xdm b/conf.d/._cfg0000_xdm
deleted file mode 100644
index c82fece0..00000000
--- 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 00000000..164c2c66
--- /dev/null
+++ b/config-archive/etc/conf.d/xdm
@@ -0,0 +1,12 @@
+# 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"
+DISPLAYMANAGER="kdm"
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 00000000..c82fece0
--- /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"