Do not display usage information when using the -nostart option

diff --git a/debian/changelog b/debian/changelog
index 589bb31..7133600 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-x (0.4.1) unstable; urgency=low
+
+  * Do not display usage information when using the -nostart option.
+    Thanks to Thomas Lehmann for the idea.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 19 Nov 2008 00:05:27 +0100
+
 grml-x (0.4.0) unstable; urgency=low
 
   * Provide /etc/X11/xorg.conf.virtualbox

diff --git a/grml-x b/grml-x
index 62d2c5a..a28a5fb 100755 (executable)
--- 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 {{{
@@ -911,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
 }
 # }}}