From f44d17af4512efef4f192722a2295ac401252074 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 25 Jul 2007 20:00:10 +0200 Subject: [PATCH] bootsplash: use tty14 and chvt --- debian/changelog | 3 ++- grml-autoconfig | 32 +++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 52ecd90..0d889dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ grml-autoconfig (0.7.11) unstable; urgency=low * Rename bootoption splash into "textsplash" (and additionally support "tsplash" as well) so users can use graphical splash - from Debian *or* textsplash of grml. + from Debian *or* textsplash of grml. Use tty14 instead of tty7 + and switch there using chvt. * Fix code regression of checkbootparam (use '||' instead of '-o') -- Michael Prokop Wed, 25 Jul 2007 19:12:56 +0200 diff --git a/grml-autoconfig b/grml-autoconfig index 1686c63..04625a9 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # 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] +# Latest change: Mit Jul 25 19:59:07 CEST 2007 [mika] ################################################################################ # http://wiki.debian.org/LSBInitScripts => @@ -64,7 +64,7 @@ checkvalue $CONFIG_DEBUG && config_debug SPLASH='' if checkbootparam "textsplash" || checkbootparam "tsplash"; then - SPLASH=1 + SPLASH=1 fi if [ -z "$SPLASH" ] ; then @@ -89,7 +89,10 @@ if checkbootparam "forensic" ; then rundebugshell 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 @@ -101,7 +104,7 @@ 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 +126,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 +145,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,7 +161,7 @@ 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 @@ -168,7 +171,7 @@ checkvalue $CONFIG_PCMCIA && config_pcmcia 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 @@ -188,7 +191,7 @@ checkvalue $CONFIG_MOUSE && config_mouse checkvalue $CONFIG_DHCP && config_dhcp -[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty7 +[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "|||||||">/dev/tty14 checkvalue $CONFIG_SYSLOG && config_syslog @@ -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 @@ -262,7 +265,10 @@ 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_GRML2HD && config_grml2hd -- 2.1.4