From d9b02d5c66447887c968ced4b4d4f64eeb1e9daf Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 30 Jan 2011 23:14:41 +0100
Subject: [PATCH] move xinitrc to /etc/X11/cdm/ and document it's use

---
 src/cdm          |  2 +-
 src/xinitrc      |  6 ++++++
 src/xinitrc.skel | 11 -----------
 3 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 src/xinitrc.skel

diff --git a/src/cdm b/src/cdm
index 89b98b5..42ebf22 100755
--- a/src/cdm
+++ b/src/cdm
@@ -249,7 +249,7 @@ xstart() {
 			wm_bin="$sysclientrc $wm_bin"
 		fi
 	else
-		wm_bin="/usr/share/cdm/xinitrc $wm_bin"
+		wm_bin="/etc/X11/cdm/xinitrc $wm_bin"
 	fi
 
 	serverargs=":${display} ${serverargs} vt$((xtty+display))"
diff --git a/src/xinitrc b/src/xinitrc
index a150f8a..a59fa0f 100644
--- a/src/xinitrc
+++ b/src/xinitrc
@@ -1,4 +1,10 @@
 #!/bin/sh
+#
+# If option usexinit is set then this file is not used.  Instead ~/.xinitrc
+# if it exists or else /etc/X11/xinit/xinitrc is used in it's place.
+
+
+# Put your configuration above this line.
 
 wm_bin="$1"
 exec ${wm_bin}
diff --git a/src/xinitrc.skel b/src/xinitrc.skel
deleted file mode 100644
index 48abd42..0000000
--- a/src/xinitrc.skel
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-###########################
-
-# Custom xinitrc goes here
-
-###########################
-
-
-wm_bin="$1"
-exec ${wm_bin}