zsh-login: do not run grml-quickconfig when bootoption startx is present

diff --git a/debian/changelog b/debian/changelog
index 90b5382..081d7dc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (1.0.4) unstable; urgency=low
+
+  * zsh-login: do not run grml-quickconfig when bootoption startx
+    is present. Thanks for the bugreport, Darshaka Pathirana!
+
+ -- Michael Prokop <mika@grml.org>  Sun, 10 Jun 2007 13:11:38 +0200
+
 grml-scripts (1.0.3) unstable; urgency=low
 
   * grml-lang: support dvorak keyboard layout

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 1f8d270..639585d 100755 (executable)
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -33,7 +33,7 @@ case "$CMDLINE" in
          flite -o play -t "Finished booting"
       fi
       ;;
-   noquick)
+   noquick*|startx*)
       # do nothing
       ;;
    *) # by default run grml-quickconfig, but only if running as root