diff options
| author | Manuel Schneider | 2013-12-12 14:42:53 +0100 |
|---|---|---|
| committer | Manuel Schneider | 2013-12-12 14:42:53 +0100 |
| commit | 8e3be516f7a76c6d6431745a22d99961dd402ee6 (patch) | |
| tree | fba613c87a6d8df02ac068cec6714bdaba132337 /remote/modules | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-8e3be516f7a76c6d6431745a22d99961dd402ee6.tar.gz tm-scripts-8e3be516f7a76c6d6431745a22d99961dd402ee6.tar.xz tm-scripts-8e3be516f7a76c6d6431745a22d99961dd402ee6.zip | |
[xorg/kdm] kdm/Xsetup sources global xorg/XSetup
Diffstat (limited to 'remote/modules')
| -rwxr-xr-x | remote/modules/kdm/data/etc/kde4/kdm/Xsetup | 6 | ||||
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xsetup | 9 |
2 files changed, 15 insertions, 0 deletions
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 |