X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fzsh-login;h=30d277b403b6460eba2b8b88bdf305713e87f40a;hb=cdb523d5ab869b95f9c33fa0928744adcfb64e2d;hp=1a41bae3127f53c5f64aee344d0d62fd060b4cad;hpb=470961a79c6f99cdec8d3063e4ad89ca6297982b;p=grml-scripts.git

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 1a41bae..30d277b 100755
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -1,47 +1,71 @@
 #!/bin/sh
 # Filename:      zsh-login
-# Purpose:       run zsh with login option
+# Purpose:       customized zsh login welcome screen for use at grml
 # 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 12:40:51 CET 2007 [mika]
+# Latest change: Sam Jun 23 23:53:09 CEST 2007 [mika]
 ################################################################################
 
-[ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
-
-echo "
-
-Welcome to grml ${GRMLVERSION}!
-
-New to grml? Want to read some documentation?
-Start via running 'grml-info'.
-Get tips and hints via 'grml-tips \$KEYWORD'.
-New to zsh? Run 'zsh-help'.
-
-Switch to other consoles via alt-F<number> keys.
+. /etc/grml/sh-lib
 
-Happy hacking!               http://grml.org/
-"
+[ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
+[ -r /etc/hostname ] && HOSTNAME=$(cat /etc/hostname) || HOSTNAME='grml'
 
+# allow customized release information
 [ -r /etc/release_info ] && cat /etc/release_info
 
+PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/home/grml/bin
+
 CMDLINE=$(cat /proc/cmdline)
 case "$CMDLINE" in
+   # allow customized startup via bootoption startup:
+   *startup*)
+       script="$(getBootParam startup)"
+       if [ -x $(which $script) ] ; then
+          $script
+       fi
+       ;;
+   # turn on speakers for accessibility users:
    *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
       ;;
+
+   # do nothing if booting with noquick:
    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
 
+# just print out one single line if bootoption nowelcome is present,
+# otherwise print usual welcome screen
+if grep nowelcome /proc/cmdline 2>/dev/null ; then
+   echo
+else
+   echo "
+
+Welcome to $HOSTNAME ${GRMLVERSION}!
+
+New to grml? Want to read some documentation?
+Start via running 'grml-info'.
+Get tips and hints via 'grml-tips \$KEYWORD'.
+New to zsh? Run 'zsh-help'.
+
+Switch to other consoles via alt-F<number> keys.
+
+Happy hacking!               http://grml.org/
+"
+fi
+
 exec /bin/zsh -l
 
 ## END OF FILE #################################################################