zsh-login: support bootoptions startup and nowelcome; use /etc/hostname

diff --git a/debian/changelog b/debian/changelog
index a65da23..ef61bdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grml-scripts (1.0.6) unstable; urgency=low
+
+  * zsh-login: support bootoptions startup (allow execution
+    of script/program via bootoption startup=$script) and nowelcome
+    (do not print welcome screen at all) and use /etc/hostname
+    as distribution name within welcome screen.
+
+ -- Michael Prokop <mika@grml.org>  Sat, 23 Jun 2007 23:55:14 +0200
+
 grml-scripts (1.0.5) unstable; urgency=low
 
   [Michael Prokop]

diff --git a/usr_bin/zsh-login b/usr_bin/zsh-login
index 639585d..30d277b 100755 (executable)
--- a/usr_bin/zsh-login
+++ b/usr_bin/zsh-login
@@ -1,40 +1,41 @@
 #!/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: Don Mär 29 16:02:01 CEST 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
       ;;
-   noquick*|startx*)
-      # do nothing
+
+   # do nothing if booting with noquick:
+   noquick)
       ;;
    *) # by default run grml-quickconfig, but only if running as root
       if [ $(id -u) = "0" ] ; then
@@ -45,6 +46,26 @@ case "$CMDLINE" in
       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 #################################################################