X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=grml-autoconfig;h=6e71b4d868dd6d1f97822b3a9761db97b0857bdf;hp=12180436bfe373e48c785e127c530e0942d914e1;hb=HEAD;hpb=b15ea38b6cb805e68c406b0ea4ac498c6d96e212

diff --git a/grml-autoconfig b/grml-autoconfig
index 1218043..dedb9a8 100755
--- a/grml-autoconfig
+++ b/grml-autoconfig
@@ -32,7 +32,7 @@ fi
 # }}}
 
 # {{{ path, signals, umask, zsh, colors
-export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin"
+export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
 umask 022
 # Ignore these signals: INT, TERM, SEGV
 trap "" 2 3 11
@@ -54,33 +54,10 @@ mount_sys
 # }}}
 
 # {{{ main grml-autoconfig
-checkvalue $CONFIG_DEBUG && config_debug
-
-SPLASH=''
-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
-fi
-
-if [ -z "$BOOTDEBUG" ] ; then
-   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 $?
+# make sure symlink /etc/mtab exists, this is usually handled by
+# /etc/init.d/checkroot.sh but we don't execute this script on the live system
+if [ -z "$INSTALLED" ] ; then
+  ln -sf /proc/mounts /etc/mtab
 fi
 
 checkvalue $CONFIG_SYSLOG && config_syslog
@@ -90,84 +67,32 @@ if checkbootparam 'forensic' ; then
    ewarn " Do *NOT* boot with something like 'grml forensic ...' but always use 'forensic ...' instead!" ; eend 0
 fi
 
-if [ -n "$SPLASH" ] ; then
-   /usr/bin/grml-bootsplash "|">/dev/tty14
-   chvt 14
-fi
-
 checkvalue $CONFIG_LANGUAGE && config_language
 
 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/tty14
-
 checkvalue $CONFIG_HOSTNAME && config_hostname
 
-checkvalue $CONFIG_USERFSTAB && config_userfstab
-
 checkvalue $CONFIG_TIME && config_time
 
 checkvalue $CONFIG_KERNEL &&  config_kernel
 
-checkvalue $CONFIG_SMALL && config_small
-
-checkvalue $CONFIG_LD_MOD && config_ld_mod
+checkvalue $CONFIG_SECUREBOOT && config_secureboot
 
 checkvalue $CONFIG_TIMEZONE && config_timezone
 
-checkvalue $CONFIG_FAST && config_fast
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||">/dev/tty14
-
 checkvalue $CONFIG_SWRAID && config_swraid
 
-checkvalue $CONFIG_DMRAID && config_dmraid
-
 checkvalue $CONFIG_LVM && config_lvm
 
-# No kernel messages while probing modules
-echo "0" > /proc/sys/kernel/printk
-
-checkvalue $CONFIG_LOCAL_NET && config_local_net
-
 checkvalue $CONFIG_TESTCD && config_testcd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
-
-checkvalue $CONFIG_HWINFO && config_hwinfo
-
-checkvalue $CONFIG_MODULES && config_modules
-
-checkvalue $CONFIG_ACPI_APM && config_acpi_apm
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
-
-checkvalue $CONFIG_PCMCIA && config_pcmcia
-
-[ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
-
-checkvalue $CONFIG_BLIND && config_blind
+checkvalue $CONFIG_BRLTTY && config_brltty
 
-checkvalue $CONFIG_AGP && config_agp
-
-checkvalue $CONFIG_AUTOMOUNTER && config_automounter
-
-checkvalue $CONFIG_DMA && config_dma
+checkvalue $CONFIG_ACPI && config_acpi
 
 checkvalue $CONFIG_FSTAB && config_fstab
 
-checkvalue $CONFIG_MOUSE && config_mouse
-
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14
-
 checkvalue $CONFIG_CPU && config_cpu
 
 checkvalue $CONFIG_SSH && config_ssh
@@ -190,84 +115,37 @@ checkvalue $CONFIG_FINDDCSDIR && config_umount_dcsdir
 
 checkvalue $CONFIG_PARTCONF && config_partconf
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||">/dev/tty14
-
-# device symlinks {{{
-  [ -r /mnt/floppy ] || mkdir /mnt/floppy
-  [ -r /mnt/cdrom ]  || mkdir /mnt/cdrom
-  [ -r /mnt/test ]   || mkdir /mnt/test
-# }}}
-
 checkvalue $CONFIG_MIXER && config_mixer
 
-checkvalue $CONFIG_MODEM && config_modem
-
-checkvalue $CONFIG_WONDERSHAPER && config_wondershaper
-
 checkvalue $CONFIG_GPM && config_gpm
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||||">/dev/tty14
-
-checkvalue $CONFIG_NETCONFIG && config_netconfig
-
-checkvalue $CONFIG_NETSCRIPT && config_netscript
-
 checkvalue $CONFIG_SERVICES && config_services
 
-checkvalue $CONFIG_NETIPV6 && config_ipv6
-
 checkvalue $CONFIG_DEBNET && config_debnet
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty14
+checkvalue $CONFIG_DISPLAY_SSH_FINGERPRINTS && config_display_ssh_fingerprints
 
-checkvalue $CONFIG_CONSOLE && config_console
+checkvalue $CONFIG_NETCONFIG && config_netconfig
 
-checkvalue $CONFIG_BLINDSOUND && config_blindsound
+checkvalue $CONFIG_NETSCRIPT && config_netscript
 
-checkvalue $CONFIG_WELCOME && config_welcome
+checkvalue $CONFIG_CONSOLE && config_console
 
-checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
+checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
 
-checkvalue $CONFIG_915RESOLUTION && config_915resolution
+checkvalue $CONFIG_VIRTUALBOX_SETUP && config_virtualbox_setup
 
 checkvalue $CONFIG_MYPATH && config_mypath
 
-checkvalue $CONFIG_DISTCC && config_distcc
-
 checkvalue $CONFIG_DISTRI && config_distri
 
 checkvalue $CONFIG_BLANKING && config_blanking
 
-if [ -n "$SPLASH" ] ; then
-   /usr/bin/grml-bootsplash "|||||||||||">/dev/tty14
-   chvt 1
-fi
-
-checkvalue $CONFIG_TOHD && config_tohd
-
-checkvalue $CONFIG_GRML2HD && config_grml2hd
-
 checkvalue $CONFIG_DEBOOTSTRAP && config_debootstrap
 
 checkvalue $CONFIG_XSTARTUP && config_x_startup
-# }}}
 
-# {{{ debug
-if [ -z "$SPLASH" ] ; then
-   stage=6
-   rundebugshell
-fi
-
-if [ -n "$BOOTDEBUG" ] ; then
-   # set only if not already set
-   if [ -z "$CMDLINE" ] ; then
-     CMDLINE="$(cat /proc/cmdline)"
-     [ -d /cdrom/bootparams/ ] && CMDLINE="$CMDLINE $(cat /cdrom/bootparams/*)"
-     [ -d /live/image/bootparams/ ] && CMDLINE="$CMDLINE $(cat /live/image/bootparams/*)"
-   fi
-   einfo "Bootoption debug detected. Printing kernel command line:"
-   echo "$CMDLINE"
-fi
+checkvalue $CONFIG_EASTEREGG && config_easteregg
 # }}}
 
 # {{{ Re-enable signals