Remove further X11R6 remnants

[grml-autoconfig.git] / grml-autoconfig

diff --git a/grml-autoconfig b/grml-autoconfig
index 82594b7..30f496d 100755 (executable)
--- 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
@@ -56,11 +56,6 @@ 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
@@ -70,10 +65,8 @@ if [ -z "$INSTALLED" -a -e /live/cow ] ; then
    fi
 fi
 
-if [ -z "$SPLASH" ] ; then
-   stage=5
-   rundebugshell
-fi
+stage=5
+rundebugshell
 
 if [ -z "$BOOTDEBUG" ] ; then
    einfo "Setting kernel ring buffer to level 2."
@@ -90,11 +83,6 @@ 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
@@ -103,8 +91,6 @@ 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
@@ -121,8 +107,6 @@ 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
@@ -136,17 +120,9 @@ checkvalue $CONFIG_LOCAL_NET && config_local_net
 
 checkvalue $CONFIG_TESTCD && config_testcd
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||">/dev/tty14
-
 checkvalue $CONFIG_MODULES && config_modules
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||">/dev/tty14
-
-checkvalue $CONFIG_ACPI_APM && config_acpi_apm
-
-[ -n "$SPLASH" ] &&  /usr/bin/grml-bootsplash "||||||">/dev/tty14
-
-checkvalue $CONFIG_AGP && config_agp
+checkvalue $CONFIG_ACPI && config_acpi
 
 checkvalue $CONFIG_DMA && config_dma
 
@@ -154,8 +130,6 @@ 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
@@ -178,8 +152,6 @@ 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
@@ -194,8 +166,6 @@ 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
@@ -206,14 +176,10 @@ checkvalue $CONFIG_NETIPV6 && config_ipv6
 
 checkvalue $CONFIG_DEBNET && config_debnet
 
-[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||||||">/dev/tty14
-
 checkvalue $CONFIG_CONSOLE && config_console
 
 checkvalue $CONFIG_FIX_UNIONFS && fix_unionfs
 
-checkvalue $CONFIG_915RESOLUTION && config_915resolution
-
 checkvalue $CONFIG_VIRTUALBOX_SHARED_FOLDERS && config_virtualbox_shared_folders
 
 checkvalue $CONFIG_MYPATH && config_mypath
@@ -224,25 +190,16 @@ 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
+stage=6
+rundebugshell
 
 if [ -n "$BOOTDEBUG" ] ; then
    # set only if not already set