[kmd/xorg] Use only xorg scripts (xsetup, xsession, ...). Ignore kdm scripts.

4 files changed, 31 insertions, 3 deletions

diff --git a/remote/modules/xorg/data/etc/X11/Xreset b/remote/modules/xorg/data/etc/X11/Xreset
index a77cf2c0..4ed680ce 100755
--- a/remote/modules/xorg/data/etc/X11/Xreset
+++ b/remote/modules/xorg/data/etc/X11/Xreset
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/ash
 #
 # /etc/X11/Xreset
 #
-# global Xreset file -- for use by display managers
+# Xreset - run as root after session exits
+#
 
-# $Id: Xsession 967 2005-12-27 07:20:55Z dnusinow $
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
 set -e
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
index dc64cf77..914dd2e8 100755
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -1,4 +1,12 @@
 #!/bin/ash
+#
+# /etc/X11/Xsession
+#
+# Xsession is executed to start the user's session (as the user)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
+
 
 #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory.
 
diff --git a/remote/modules/xorg/data/etc/X11/Xsetup b/remote/modules/xorg/data/etc/X11/Xsetup
index f57fe3be..524f7d84 100755
--- a/remote/modules/xorg/data/etc/X11/Xsetup
+++ b/remote/modules/xorg/data/etc/X11/Xsetup
@@ -1,4 +1,11 @@
 #!/bin/ash
+#
+# /etc/X11/Xsetup
+#
+# Xsetup is executed once before the greeter starts (as root)
+# 
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin"
 
 SESSIONDIR="/etc/X11/Xsetup.d"
 
diff --git a/remote/modules/xorg/data/etc/X11/Xstartup b/remote/modules/xorg/data/etc/X11/Xstartup
new file mode 100755
index 00000000..5631fa65
--- /dev/null
+++ b/remote/modules/xorg/data/etc/X11/Xstartup
@@ -0,0 +1,12 @@
+#!/bin/ash
+#
+# /etc/X11/Xstartup
+#
+# Xstartup is executed on successful authentication, before the session is opened (as root)
+#
+
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin" 
+
+
+
+