X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=grml-x;h=a28a5fb283cbbdf3226ad117fee9231e2083fcfc;hb=0b8b42c9650183d8043520731bab56edb40a94d4;hp=0fd3351ea1b0a0cbb96851855e9611addaf242c7;hpb=4e2fa1c824b66c7f22247f1522661911eddcf004;p=grml-x.git

diff --git a/grml-x b/grml-x
index 0fd3351..a28a5fb 100755
--- a/grml-x
+++ b/grml-x
@@ -4,7 +4,6 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Die Sep 04 01:44:19 CEST 2007 [mika]
 ################################################################################
 
 # make sure /tmp is writeable {{{
@@ -893,6 +892,11 @@ $fg[red]"
 function runit
 {
   writeconfig
+  if [ "$(readlink /etc/X11/X)" = /bin/true ] ; then
+     print "$bold_color$fg[red]Fatal: /etc/X11/X is a symlink to /bin/true."
+     print "Fix it via running 'ln -sf /usr/bin/Xorg /etc/X11/X'"
+     exit 10
+  fi
   if [ -z "$NOSTART" ] ; then
     print "$reset_color"
     if [ -x /etc/init.d/xorg-common ] ; then
@@ -906,14 +910,15 @@ function runit
     if [ -z "$DISPLAY" ] ; then
       print "$bold_color$fg[green]Now trying to run startx.$reset_color"
       startx $XINITRC -- $XOPTS
+      return 1
     else
       print "$bold_color$fg[green]Now trying to run startx on display $DISPLAY.$reset_color"
       startx $XINITRC -- :$DISPLAY $XOPTS
+      return 1
     fi
   else
     print "$bold_color$fg[blue]Not running startx as requested via option.$reset_color"
   fi
-  return 1
 }
 # }}}