Remove tsplash support

diff --git a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE
index 9f365ab..a4084d6 100644 (file)
--- a/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE
+++ b/etc/grml/fai/config/files/etc/runlevel.conf/GRMLBASE
@@ -16,7 +16,6 @@
 ############################################################################
 # Format:
 # <sort> <off-> <on-levels>     <command>
 ############################################################################
 # Format:
 # <sort> <off-> <on-levels>     <command>

-01     -       2               /etc/init.d/bootsplash_start.sh

 01     -       S               /etc/init.d/bootlocal.first
 02     -       S               /etc/init.d/mountkernfs.sh
 02     -       S               /etc/init.d/hostname.sh
 01     -       S               /etc/init.d/bootlocal.first
 02     -       S               /etc/init.d/mountkernfs.sh
 02     -       S               /etc/init.d/hostname.sh


@@ -41,6 +40,5 @@
 90     -       1               /etc/init.d/single
 98     -       2               /etc/init.d/grml-home
 99     -       2               /etc/init.d/grml-misc
 90     -       1               /etc/init.d/single
 98     -       2               /etc/init.d/grml-home
 99     -       2               /etc/init.d/grml-misc

-99     -       2               /etc/init.d/bootsplash_end.sh

 99     -       2               /etc/init.d/bootlocal.last
 # THE LAST LINE IS NEVER READ
 99     -       2               /etc/init.d/bootlocal.last
 # THE LAST LINE IS NEVER READ

diff --git a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE
index 155c2d9..4dae967 100755 (executable)
--- a/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE
+++ b/etc/grml/fai/config/files/usr/share/initramfs-tools/scripts/init-top/grml/GRMLBASE
@@ -159,10 +159,6 @@ if [ -n "$GRML_VERSION" ] ; then
    echo
 fi
 
    echo
 fi
 

-# don't output anything if running with bootsplash feature
-if checkbootparam "splash" ; then
-  exec >/dev/null </dev/null 2>&1
-fi

 # }}}
 
 ## /proc/cmdline handling {{{
 # }}}
 
 ## /proc/cmdline handling {{{

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index 13d7d03..3217b59 100644 (file)
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -161,7 +161,6 @@ grml nosyslog                       Do not start syslog daemon
 grml nogpm                          Disable GPM daemon
 grml noconsolefont                  Disable setting of console font (using consolechars)
 grml noblank                        Disable console blanking
 grml nogpm                          Disable GPM daemon
 grml noconsolefont                  Disable setting of console font (using consolechars)
 grml noblank                        Disable console blanking

-grml tsplash                        Text based bootsplash

 grml noquick                        Disable grml-quickconfig startup script
 grml small                          Do not start that many consoles
 grml wondershaper=eth0,1000,500     Set up basic traffic shaping
 grml noquick                        Disable grml-quickconfig startup script
 grml small                          Do not start that many consoles
 grml wondershaper=eth0,1000,500     Set up basic traffic shaping