X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=04625a93abd65e2f43c354485096deef4e4cc9a6;hp=e9e692febab03ac28b58f93763fcfc6f03ab8167;hb=ca52807ab2e608d9a4281b61fb8915ca4eb06055;hpb=c9673f53bab9118d1a6eaae9fa2ce803c590bea0

diff --git a/grml-autoconfig b/grml-autoconfig
index e9e692f..04625a9 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -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: Mon Apr 16 19:34:17 CEST 2007 [mika]
+# Latest change: Mit Jul 25 19:59:07 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -17,6 +17,7 @@
 # Default-Stop:
 ### END INIT INFO
 
+# {{{ placeholder functions for restart/reload/stop
 if [[ $1 == "restart" ]] ; then
   echo "$0 restart - empty placeholder. Doing nothing but running."
 fi
@@ -29,6 +30,7 @@ if [[ $1 == "stop" ]] ; then
   echo "$0 stop - empty placeholder. Doing nothing but exiting."
   exit 1
 fi
+# }}}
 
 # {{{ path, signals, umask, zsh, colors
 export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
@@ -43,7 +45,7 @@ setopt no_nomatch # avoid 'no matches found: ...'
 # {{{ source main files
 source /etc/grml/autoconfig            # configuration file
 source /etc/grml/autoconfig.functions  # functions
-source /etc/grml/lsb-functions
+source /etc/grml/lsb-functions         # helper functions for smart display
 # }}}
 
 # {{{ mount important directories
@@ -61,8 +63,8 @@ CMDLINE="$(cat /proc/cmdline)"
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "splash" ; then
-  SPLASH=1
+if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+   SPLASH=1
 fi
 
 if [ -z "$SPLASH" ] ; then
@@ -87,7 +89,10 @@ if checkbootparam "forensic" ; then
    rundebugshell
 fi
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|">/dev/tty7
+if [ -n "$SPLASH" ] ; then
+   /usr/bin/grml-bootsplash "|">/dev/tty14
+   chvt 14
+fi
 
 checkvalue $CONFIG_LANGUAGE && config_language
 
@@ -99,7 +104,7 @@ checkvalue $CONFIG_FWTIMEOUT && config_fwtimeout
 
 checkvalue $CONFIG_FIX_PASSWD && config_fix_passwd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||">/dev/tty14
 
 checkvalue $CONFIG_HOSTNAME && config_hostname
 
@@ -121,7 +126,7 @@ checkvalue $CONFIG_TIMEZONE && config_timezone
 
 checkvalue $CONFIG_FAST && config_fast
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty14
 
 checkvalue $CONFIG_ENVIRONMENT && config_environment
 
@@ -140,7 +145,7 @@ checkvalue $CONFIG_FIREWIRE_DEV && config_firewire_dev
 
 checkvalue $CONFIG_TESTCD && config_testcd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
 
 checkvalue $CONFIG_DISCOVER && config_discover
 
@@ -156,7 +161,7 @@ checkvalue $CONFIG_MODULES && config_modules
 
 checkvalue $CONFIG_ACPI_APM && config_acpi_apm
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
 
 checkvalue $CONFIG_PCMCIA && config_pcmcia
 
@@ -166,7 +171,7 @@ checkvalue $CONFIG_PCMCIA && config_pcmcia
 
 checkvalue $CONFIG_KEYBOARD && config_keyboard
 
-[ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty7
+[ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
 
 checkvalue $CONFIG_BLIND && config_blind
 
@@ -186,7 +191,7 @@ checkvalue $CONFIG_MOUSE && config_mouse
 
 checkvalue $CONFIG_DHCP && config_dhcp
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
 
 checkvalue $CONFIG_SYSLOG && config_syslog
 
@@ -206,7 +211,7 @@ checkvalue $CONFIG_DEBS && config_debs
 
 checkvalue $CONFIG_SCRIPTS && config_scripts
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
 
 checkvalue $CONFIG_CDROM_SCRIPTS && config_cdrom_scripts
 
@@ -224,7 +229,7 @@ checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
 
 checkvalue $CONFIG_GPM && config_gpm
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty14
 
 checkvalue $CONFIG_SERVICES && config_services
 
@@ -234,7 +239,7 @@ checkvalue $CONFIG_NETIPV6 && config_ipv6
 
 checkvalue $CONFIG_DEBNET && config_debnet
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty7
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty14
 
 checkvalue $CONFIG_CONSOLE && config_console
 
@@ -250,6 +255,8 @@ checkvalue $CONFIG_CREATE_MNT_DIRS && create_mnt_dirs
 
 checkvalue $CONFIG_915RESOLUTION && config_915resolution
 
+checkvalue $CONFIG_IPW3945 && config_ipw3945
+
 checkvalue $CONFIG_AUTOMOUNT && config_automount
 
 checkvalue $CONFIG_DISTCC && config_distcc
@@ -258,7 +265,10 @@ checkvalue $CONFIG_DISTRI && config_distri
 
 checkvalue $CONFIG_BLANKING && config_blanking
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||||">/dev/tty7
+if [ -n "$SPLASH" ] ; then
+   /usr/bin/grml-bootsplash "|||||||||||">/dev/tty14
+   chvt 1
+fi
 
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
@@ -272,7 +282,6 @@ if [ -z "$SPLASH" ] ; then
   stage=6
   rundebugshell
 fi
-# }}}
 
 if [ -n "$BOOTDEBUG" ] ; then
   CMDLINE="$(cat /proc/cmdline)"
@@ -280,6 +289,7 @@ if [ -n "$BOOTDEBUG" ] ; then
   einfo "Bootoption debug detected. Printing kernel command line:"
   echo "$CMDLINE"
 fi
+# }}}
 
 # {{{ Re-enable signals
 trap 2 3 11