diff options
| author | Jonathan Bauer | 2014-01-29 15:32:30 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-29 15:32:30 +0100 |
| commit | 675a0628c627a83ef04742d22d4822d92330b8ae (patch) | |
| tree | b6d29ecfd3162687be8b9c880aa4bb43ac1f51bf /remote/modules/xorg/data | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-675a0628c627a83ef04742d22d4822d92330b8ae.tar.gz tm-scripts-675a0628c627a83ef04742d22d4822d92330b8ae.tar.xz tm-scripts-675a0628c627a83ef04742d22d4822d92330b8ae.zip | |
[xorg] Source /etc/profile in Xsession script. This fixes the
/etc/profile.d/00-autostart not beeing run when just starting a
graphical session. (Fixes the linking of user specific config directory
for xfce4 and others) Now xfce4 config are beeing stored in the user's
home.
Diffstat (limited to 'remote/modules/xorg/data')
| -rwxr-xr-x | remote/modules/xorg/data/etc/X11/Xsession | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession index 914dd2e8..63f594b5 100755 --- a/remote/modules/xorg/data/etc/X11/Xsession +++ b/remote/modules/xorg/data/etc/X11/Xsession @@ -10,6 +10,11 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/o #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory. +PROFILE="/etc/profile" +if [ -e "$PROFILE" ]; then + . "$PROFILE" || slxlog "xsession" "Xsession: Could not source $PROFILE" "$PROFILE" +fi + SESSIONDIR="/etc/X11/Xsession.d" if [ -d "$SESSIONDIR" ]; then |