diff options
| author | Christian Rößler | 2013-06-24 14:25:24 +0200 |
|---|---|---|
| committer | Christian Rößler | 2013-06-24 14:25:24 +0200 |
| commit | d824f0267e4af36bd8de185a6136824a06441cf1 (patch) | |
| tree | 32b1911b8efb25c3eb1851dea2a63f460fe8188a /remote/modules/xorg/data | |
| parent | Inserted detection of pango-querymodules-64 in case of 64bit OS (diff) | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-d824f0267e4af36bd8de185a6136824a06441cf1.tar.gz tm-scripts-d824f0267e4af36bd8de185a6136824a06441cf1.tar.xz tm-scripts-d824f0267e4af36bd8de185a6136824a06441cf1.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/xorg/data')
| -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 |