X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fzsh-login;h=1f8d2708f2ae1584416839f9309f6778b728cae6;hb=db8bf7a6603507d5b9664d1c631c89a828279748;hp=382cdb41b4a8fd27b2c5a545be722003dca41285;hpb=d6b26ce3b8ffa721052bfb0eebc546ac9a63e5f9;p=grml-scripts.git

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 382cdb4..1f8d270 100755
--- 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