X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=68961f259ab7b4d23f11e4a66ad4eff9c05d9c8f;hp=8c2ba7e366b168dd2c915901a4e59c14a7a7cc27;hb=c787948c5c204d1e02cb87c6d2f556939e3ffc4f;hpb=10b92124b47fe00782e3075960330ee223872cf7

diff --git a/grml-autoconfig b/grml-autoconfig
index 8c2ba7e..68961f2 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: Mit Jul 25 19:12:49 CEST 2007 [mika]
+# Latest change: Mon Sep 17 17:39:29 CEST 2007 [mika]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -63,8 +63,17 @@ CMDLINE="$(cat /proc/cmdline)"
 checkvalue $CONFIG_DEBUG && config_debug
 
 SPLASH=''
-if checkbootparam "textsplash" -o checkbootparam "tsplash"; then
-  SPLASH=1
+if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+   SPLASH=1
+fi
+
+# update /etc/mtab if running in live-initramfs mode:
+if [ -z "$INSTALLED" -a -e /live/cow ] ; then
+   if ! grep -q rootfs /etc/mtab ; then
+      for i in rootfs sysfs proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
+          grep $i /proc/mounts >> /etc/mtab
+      done
+   fi
 fi
 
 if [ -z "$SPLASH" ] ; then
@@ -89,7 +98,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
 
@@ -101,7 +113,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
 
@@ -123,7 +135,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
 
@@ -142,7 +154,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
 
@@ -158,7 +170,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
 
@@ -168,7 +180,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
 
@@ -188,7 +200,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
 
@@ -208,7 +220,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
 
@@ -226,7 +238,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
 
@@ -236,7 +248,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
 
@@ -262,7 +274,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