/etc/init.d/bootsplash*: Adjust check for bootoption tsplash + textsplash

diff --git a/debian/changelog b/debian/changelog
index 604f9a0..473a54b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc (1.0.18) unstable; urgency=low
+
+  * Adjust check for bootoption tsplash + textsplash in
+    /etc/init.d/bootsplash_end.sh and /etc/init.d/bootsplash_start.sh
+
+ -- Michael Prokop <mika@grml.org>  Thu, 20 Sep 2007 16:04:54 +0200
+
 grml-etc (1.0.17) unstable; urgency=low
 
   * /etc/skel/.xinitrc: make sure /etc/sysconfig/keyboard is readable.

diff --git a/etc/init.d/bootsplash_end.sh b/etc/init.d/bootsplash_end.sh
index f7c634a..d859392 100755 (executable)
--- a/etc/init.d/bootsplash_end.sh
+++ b/etc/init.d/bootsplash_end.sh
@@ -4,15 +4,15 @@
 # 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: Fre Aug 04 12:20:30 CEST 2006 [mika]
+# Latest change: Don Sep 20 15:56:56 CEST 2007 [mika]
 ################################################################################
 
 . /etc/grml/autoconfig.functions
 
-if checkbootparam "splash" ; then
-  /usr/bin/grml-bootsplash "||||||||||||">/dev/tty7
+if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+  /usr/bin/grml-bootsplash "||||||||||||">/dev/tty14
   chvt 1
-  deallocvt 7
+  deallocvt 14
 fi
 
 ## END OF FILE #################################################################

diff --git a/etc/init.d/bootsplash_start.sh b/etc/init.d/bootsplash_start.sh
index 7c17128..dc10337 100755 (executable)
--- a/etc/init.d/bootsplash_start.sh
+++ b/etc/init.d/bootsplash_start.sh
@@ -4,16 +4,16 @@
 # 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: Fre Aug 04 12:20:36 CEST 2006 [mika]
+# Latest change: Don Sep 20 15:56:54 CEST 2007 [mika]
 ################################################################################
 
 . /etc/grml/autoconfig.functions
 
-if checkbootparam "splash" ; then
-# make sure console font is set at this stage already
+if checkbootparam "textsplash" || checkbootparam "tsplash"; then
+  # make sure console font is set at this stage already
   consolechars -f Lat15-Terminus16
-  chvt 7
-  /usr/bin/grml-bootsplash "">/dev/tty7
+  chvt 14
+  /usr/bin/grml-bootsplash "">/dev/tty14
 fi
 
 ## END OF FILE #################################################################