From 8e3be516f7a76c6d6431745a22d99961dd402ee6 Mon Sep 17 00:00:00 2001
From: Manuel Schneider
Date: Thu, 12 Dec 2013 14:42:53 +0100
Subject: [xorg/kdm] kdm/Xsetup sources global xorg/XSetup

---
 remote/modules/kdm/data/etc/kde4/kdm/Xsetup | 6 ++++++
 remote/modules/xorg/data/etc/X11/Xsetup     | 9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 remote/modules/xorg/data/etc/X11/Xsetup

(limited to 'remote/modules')

diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
index 965f1f08..14ebe761 100755
--- a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
@@ -5,3 +5,9 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/o
 #xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &
 
 #/sbin/initctl -q emit login-session-start DISPLAY_MANAGER=kdm
+
+# Use common Xreset framework if it exist
+if [ -x /etc/X11/Xsetup ] ; then
+   /etc/X11/Xsetup
+fi
+
diff --git a/remote/modules/xorg/data/etc/X11/Xsetup b/remote/modules/xorg/data/etc/X11/Xsetup
new file mode 100755
index 00000000..f57fe3be
--- /dev/null
+++ b/remote/modules/xorg/data/etc/X11/Xsetup
@@ -0,0 +1,9 @@
+#!/bin/ash
+
+SESSIONDIR="/etc/X11/Xsetup.d"
+
+if [ -d "$SESSIONDIR" ]; then
+	for file in $SESSIONDIR/*; do
+		. $file || slxlog "xsetup" "Xsetup: Could not source $file" "$file"
+	done
+fi
-- 
cgit v1.2.3-55-g7522