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

diff --git a/grml-autoconfig b/grml-autoconfig
index 8c2ba7e..8c69443 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -4,7 +4,6 @@
 # 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]
 ################################################################################
 
 # http://wiki.debian.org/LSBInitScripts =>
@@ -63,33 +62,43 @@ 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 "none /sys sysfs" proc /live/image /live/cow /lib/init/rw /dev/shm /dev/pts ; do
+          grep $i /proc/mounts | grep -v /dev/.static >> /etc/mtab
+      done
+   fi
 fi
 
 if [ -z "$SPLASH" ] ; then
-  stage=5
-  rundebugshell
+   stage=5
+   rundebugshell
 fi
 
 if [ -z "$BOOTDEBUG" ] ; then
-  einfo "Setting kernel ring buffer to level 2."
-  echo "2" > /proc/sys/kernel/printk ; eend $?
+   einfo "Setting kernel ring buffer to level 2."
+   echo "2" > /proc/sys/kernel/printk ; eend $?
 else
-  einfo "Setting kernel ring buffer to level 6. Adjust manually via running dmesg -n \$VALUE."
-  echo "6" > /proc/sys/kernel/printk ; eend $?
+   einfo "Setting kernel ring buffer to level 6. Adjust manually via running dmesg -n \$VALUE."
+   echo "6" > /proc/sys/kernel/printk ; eend $?
 fi
 
+checkvalue $CONFIG_SYSLOG && config_syslog
+
 if checkbootparam "forensic" ; then
-   eerror "Bootopion forensic found. Important notice!"
-   eerror " Do *not* boot with something like 'grml forensic ...' but with 'forensic ...' instead!"
-   eerror " To avoid damage to your system a debugshell will be started after a delay of 10 seconds." ; eend 1
-   eerror " If you want to continue booting just exit the shell, but think about what you are doing!" ; eend 1
-   sleep 10
-   rundebugshell
+   ewarn "Bootopion forensic found. Important notice:" ; eend 0
+   ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
 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
 
@@ -97,11 +106,13 @@ checkvalue $CONFIG_LOG && config_log
 
 checkvalue $CONFIG_SWSPEAK && config_swspeak
 
+checkvalue $CONFIG_HWSPEAK && config_hwspeak
+
 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 +134,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 +153,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,17 +169,13 @@ 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
 
-# {{{ Read in what hwsetup has found
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-# }}}
-
 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
 
@@ -176,8 +183,6 @@ checkvalue $CONFIG_INTERACTIVE && config_interactive
 
 checkvalue $CONFIG_AGP && config_agp
 
-[ -f /etc/sysconfig/grml ] && . /etc/sysconfig/grml
-
 checkvalue $CONFIG_AUTOMOUNTER && config_automounter
 
 checkvalue $CONFIG_DMA && config_dma
@@ -188,9 +193,7 @@ checkvalue $CONFIG_MOUSE && config_mouse
 
 checkvalue $CONFIG_DHCP && config_dhcp
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty7
-
-checkvalue $CONFIG_SYSLOG && config_syslog
+[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
 
 checkvalue $CONFIG_CPU && config_cpu
 
@@ -208,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
 
@@ -226,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
 
@@ -236,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
 
@@ -256,13 +259,20 @@ checkvalue $CONFIG_IPW3945 && config_ipw3945
 
 checkvalue $CONFIG_AUTOMOUNT && config_automount
 
+checkvalue $CONFIG_MYPATH && config_mypath
+
 checkvalue $CONFIG_DISTCC && config_distcc
 
 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_TOHD && config_tohd
 
 checkvalue $CONFIG_GRML2HD && config_grml2hd
 
@@ -273,15 +283,15 @@ checkvalue $CONFIG_XSTARTUP && config_x_startup
 
 # {{{ debug
 if [ -z "$SPLASH" ] ; then
-  stage=6
-  rundebugshell
+   stage=6
+   rundebugshell
 fi
 
 if [ -n "$BOOTDEBUG" ] ; then
-  CMDLINE="$(cat /proc/cmdline)"
-  [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-  einfo "Bootoption debug detected. Printing kernel command line:"
-  echo "$CMDLINE"
+   CMDLINE="$(cat /proc/cmdline)"
+   [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
+   einfo "Bootoption debug detected. Printing kernel command line:"
+   echo "$CMDLINE"
 fi
 # }}}