From 119ba7bff3d83e4ce416e089ffd7acc464bc4123 Mon Sep 17 00:00:00 2001
From: Michael Neves
Date: Thu, 9 May 2013 19:01:47 +0200
Subject: fix Failsafe

---
 remote/modules/xorg/data/etc/X11/Xsession | 34 ++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'remote')

diff --git a/remote/modules/xorg/data/etc/X11/Xsession b/remote/modules/xorg/data/etc/X11/Xsession
index 529208cd..a9b3d43b 100644
--- a/remote/modules/xorg/data/etc/X11/Xsession
+++ b/remote/modules/xorg/data/etc/X11/Xsession
@@ -3,4 +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
-exec $1
+   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
-- 
cgit v1.2.3-55-g7522