zsh-login: drop nocolor check, do not run grml-quickconfig on grml-small

diff --git a/debian/changelog b/debian/changelog
index f187377..2ae05ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-scripts (0.9.35) unstable; urgency=low
+
+  * zsh-login: drop nocolor check as grml-quickconfig can handle
+    it on its own; do not run grml-quickconfig on grml-small.
+
+ -- Michael Prokop <mika@grml.org>  Thu, 29 Mar 2007 16:02:09 +0200
+
 grml-scripts (0.9.34) unstable; urgency=low
 
   * Makefile fixes for align.c, -O2 produces wrong results. 

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 382cdb4..1f8d270 100755 (executable)
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -4,7 +4,7 @@
 # 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: Sam Mär 17 15:16:04 CET 2007 [mika]
+# Latest change: Don Mär 29 16:02:01 CEST 2007 [mika]
 ################################################################################
 
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
@@ -33,12 +33,15 @@ case "$CMDLINE" in
          flite -o play -t "Finished booting"
       fi
       ;;
-   noquick|nocolor)
+   noquick)
       # do nothing
       ;;
    *) # by default run grml-quickconfig, but only if running as root
       if [ $(id -u) = "0" ] ; then
-         [ -x /usr/sbin/grml-quickconfig ] && /usr/sbin/grml-quickconfig
+        # do not run grml-quickconfig on grml-small
+        if ! grep -q small /etc/grml_version ; then
+            [ -x /usr/sbin/grml-quickconfig ] && /usr/sbin/grml-quickconfig
+         fi
       fi
 esac