X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fzsh-login;h=1f8d2708f2ae1584416839f9309f6778b728cae6;hb=96da0ec578faed11d0ce863c4823f8fead1666ed;hp=c9d4e2ea81d9dfd39eece6a904b4ec08fa67d199;hpb=e720deae78f1eda5e6f62629606c194f16796762;p=grml-scripts.git

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index c9d4e2e..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: Son Mai 28 14:20:08 CEST 2006 [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)'
@@ -25,12 +25,25 @@ Happy hacking!               http://grml.org/
 
 [ -r /etc/release_info ] && cat /etc/release_info
 
-if [ -x /usr/bin/flite ] ; then
- CMDLINE=$(cat /proc/cmdline)
- case "$CMDLINE" in
-   *swspeak*|*blind*|*brltty*|*speakup*) flite -o play -t "Finished booting" ;;
- esac
-fi
+CMDLINE=$(cat /proc/cmdline)
+case "$CMDLINE" in
+   *swspeak*|*blind*|*brltty*|*speakup*)
+      if [ -x /usr/bin/flite ] ; then
+         aumix -w 90 -v 90 -p 90 -m 90
+         flite -o play -t "Finished booting"
+      fi
+      ;;
+   noquick)
+      # do nothing
+      ;;
+   *) # by default run grml-quickconfig, but only if running as root
+      if [ $(id -u) = "0" ] ; then
+	 # 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
 
 exec /bin/zsh -l