X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=usr_bin%2Fzsh-login;h=5ac2d331c07d87ab5b7d91b5bb23dafea3e35e32;hb=2378c65d20e15a10d3a062fd75bc54f205eacc61;hp=c4787ecdcc72e8c3d106babc03bb134ee6c659a5;hpb=1f10980f818bf4dc554a901642bda49ae9f3a5ec;p=grml-scripts.git

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index c4787ec..5ac2d33 100755
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -1,10 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      zsh-login
 # 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: Son Okt 28 15:44:09 CET 2007 [mika]
 ################################################################################
 
 . /etc/grml/sh-lib
@@ -16,6 +15,20 @@
 
 PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/games:/home/grml/bin
 
+# Activate unicode console if running within utf8 environment
+# Dirty hack to fix unicode issue on amd64...
+# unicode_start during bootprocess just does not work reliable :(
+NUM_CONSOLES=12
+if [ -r /etc/default/locale ] ; then
+   if grep -q "LANG=.*UTF" /etc/default/locale ; then
+       for vc in `seq 1 ${NUM_CONSOLES}` ; do
+           echo -n -e '\033%G' > /dev/tty${vc}
+       done
+       kbd_mode -u
+       dumpkeys | loadkeys --unicode > /dev/null
+   fi
+fi
+
 CMDLINE=$(cat /proc/cmdline)
 case "$CMDLINE" in
    # allow customized startup via bootoption startup:
@@ -28,13 +41,12 @@ case "$CMDLINE" in
    # 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 if booting with bootoption noquick:
+   *noquick*)
       ;;
    *) # by default run grml-quickconfig, but only if running as root
       if [ $(id -u) = "0" ] ; then
@@ -45,9 +57,30 @@ case "$CMDLINE" in
       fi
 esac
 
+# display version information depending on the version:
+if grep -q -- '-rc[0-9]' /etc/grml_version 2>/dev/null ; then
+   echo
+   echo
+   echo 'NOTICE: This is a release candidate of grml!'
+   echo 'Please notice that this is not yet a stable release.'
+   echo 'See http://wiki.grml.org/doku.php?id=release_candidate for known issues.'
+   echo 'Please report any bugs you notice: bugs@grml.org'
+   echo
+fi
+
+if grep -q 'grml-live-autobuild' /etc/grml_version 2>/dev/null ; then
+   echo
+   echo
+   echo 'NOTICE: This is a daily snapshot version of grml!'
+   echo 'Please notice that this is not yet a stable release.'
+   echo 'See http://daily.grml.org/ for more details.'
+   echo 'Please report any bugs you notice: daily@grml.org'
+   echo
+fi
+
 # 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
+if grep -q nowelcome /proc/cmdline 2>/dev/null ; then
    echo
 else
    echo "