Adjust information text

[grml-x.git] / grml-x

diff --git a/grml-x b/grml-x
index cce4595..3b2e245 100755 (executable)
--- a/grml-x
+++ b/grml-x
@@ -174,23 +174,6 @@ sort -nur | perl -ne 's/\s+/ /; s/(\d+x\d+)/"$1"/; print')
 Option for $fg[yellow]Xinerama$fg[green] found, please use xrandr inside X.org for your further configuration!
 Trying to identify monitors now..."
 
-      # Currently we only know that it works with current intel driver,
-      # so inform user about that:
-      if [[ "$MODULE" != "intel" ]] ; then
-              print "$fg[red]
-
-Warning: using a non-intel driver - trying Xinerama setup anyway.
-If it worked please contact grml developers providing information
-about your setup so we can adjust grml-x according!
-
-      -> http://grml.org/contact/
-
-Sleeping for 10 seconds now... Will continue then...
-Just press Ctrl-C to cancel operation.
-"
-#             sleep 10 # FIXME
-      fi
-
       # make sure we have information from 2 monitors:
       # - first one from 'hwinfo --monitor'      => $MONITORINFO
       # - second one from 'hwinfo --framebuffer' => $FRAMEBUFFER
@@ -200,9 +183,10 @@ Just press Ctrl-C to cancel operation.
 Fatal: could not identify two monitors - no chance to
        set up multihead using Xinerama - sorry. :-(
 
-Please run grml-x without the -xinerama option and contact
-grml developers if you have any further useful information.
-       => http://grml.org/bugs/
+Please run grml-x without the -xinerama option to start
+X anyway (dropping support for Xinerama of course) and
+contact grml developers if you have any further useful
+information.                  => http://grml.org/bugs/
 "
          bailout 10
       fi
@@ -215,6 +199,23 @@ Fatal: could not identify monitor - no chance to
 "
          bailout 11
       else
+         # Currently we only know that it works with current intel driver,
+         # so inform user about that:
+         if [[ "$MODULE" != "intel" ]] ; then
+            print "$fg[red]
+
+Warning: using a non-intel driver - trying Xinerama setup anyway.
+If it worked please contact grml developers providing information
+about your setup so we can adjust grml-x according!
+
+      -> http://grml.org/contact/
+
+Sleeping for 10 seconds now... Will continue then...
+Just press Ctrl-C to cancel operation.
+"
+            sleep 10
+         fi
+
          # now calculate Virtual size for use with Xinerama
          HORIZ_RES1="$(grep 'Max. Resolution:' $MONITORINFO | sed 's/    Max\. Resolution: \(.*\)x\(.*\)/\1/')"
          VERIZ_RES1="$(grep 'Max. Resolution:' $MONITORINFO | sed 's/    Max\. Resolution: \(.*\)x\(.*\)/\2/')"