diff options
| author | Simon Rettberg | 2013-06-22 19:33:20 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-22 19:33:20 +0200 |
| commit | 1126c915edcf371c9981706e97708c5e9984c07a (patch) | |
| tree | 8b8ea5935591661ed37913852ba3a21ad1a19f30 /remote/modules/xorg | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.tar.gz tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.tar.xz tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.zip | |
[kdm] Add comments to kdmrc, change session directory
[dbus] Add rule that allows root to listen to all dbus communication (for debugging)
[vmchooser] move session file to new session directory
Diffstat (limited to 'remote/modules/xorg')
| -rw-r--r-- | remote/modules/xorg/data/etc/X11/Xsession | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession index a9b3d43b..5734d8c4 100644 --- a/remote/modules/xorg/data/etc/X11/Xsession +++ b/remote/modules/xorg/data/etc/X11/Xsession @@ -3,36 +3,36 @@ #Workaround to start Xsession. The original Xsession script includes error handling functionality and sources other scrips from the Xsession.d/ directory. #start selected session - case "$1" in - failsafe) - # Failsafe session was requested. - if [ -e /usr/bin/xterm ]; then - if [ -x /usr/bin/xterm ]; then - exec xterm -geometry +1+1 - else - # fatal error - errormsg "unable to launch failsafe X session ---" \ - "x-terminal-emulator not executable; aborting." - fi - else - # fatal error - errormsg "unable to launch failsafe X session ---" \ - "x-terminal-emulator not found; aborting." - fi - ;; - *) - # Specific program was requested. - STARTUP_FULL_PATH=$(/opt/openslx/usr/bin/which "${1%% *}" || true) - if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then - if [ -x "$STARTUP_FULL_PATH" ]; then - exec $1 - else - message "unable to launch \"$1\" X session ---" \ - "\"$1\" not executable; falling back to default session." - fi - else - message "unable to launch \"$1\" X session ---" \ - "\"$1\" not found; falling back to default session." - fi - ;; - esac +case "$1" in + failsafe) + # Failsafe session was requested. + if [ -e /usr/bin/xterm ]; then + if [ -x /usr/bin/xterm ]; then + exec xterm -geometry +1+1 + else + # fatal error + errormsg "unable to launch failsafe X session ---" \ + "x-terminal-emulator not executable; aborting." + fi + else + # fatal error + errormsg "unable to launch failsafe X session ---" \ + "x-terminal-emulator not found; aborting." + fi + ;; + *) + # Specific program was requested. + STARTUP_FULL_PATH=$(/opt/openslx/usr/bin/which "${1%% *}" || true) + if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then + if [ -x "$STARTUP_FULL_PATH" ]; then + exec $1 + else + message "unable to launch \"$1\" X session ---" \ + "\"$1\" not executable; falling back to default session." + fi + else + message "unable to launch \"$1\" X session ---" \ + "\"$1\" not found; falling back to default session." + fi + ;; +esac |