From: Christian Hofstaedtler Date: Wed, 16 Nov 2011 11:13:02 +0000 (+0100) Subject: Remove bootsplash X-Git-Tag: v0.9.34~7 X-Git-Url: https://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=d694c20c01f73f9224b7a6f0495656ddc32b27fb Remove bootsplash --- diff --git a/debian/rules b/debian/rules index ffbc60b..558742c 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,6 @@ install: build install -m 755 autoconfig.functions debian/grml-autoconfig/etc/grml/autoconfig.functions install -m 644 language-functions debian/grml-autoconfig/etc/grml/language-functions install -m 755 sbin/grml-autoconfig debian/grml-autoconfig/usr/sbin/grml-autoconfig - install -m 755 grml-bootsplash debian/grml-autoconfig/usr/bin/grml-bootsplash install -m 755 bin/restore-config debian/grml-autoconfig/usr/bin/restore-config install -m 755 bin/save-config debian/grml-autoconfig/usr/bin/save-config @@ -57,10 +56,8 @@ binary-indep: build install dh_testroot dh_installchangelogs dh_installdocs doc/grml-autoconfig.1.html doc/grml-autoconfig.8.html \ - doc/grml-bootsplash.1.html \ doc/restore-config.1.html doc/save-config.1.html dh_installman doc/grml-autoconfig.1.gz doc/grml-autoconfig.8.gz \ - doc/grml-bootsplash.1.gz \ doc/restore-config.1.gz doc/save-config.1.gz # backward compability: dh_link /usr/share/doc/grml-autoconfig/grml-autoconfig.1.html /usr/share/doc/grml-saveconfig/grml-config.html diff --git a/doc/Makefile b/doc/Makefile index 135fb86..45b10e6 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -9,7 +9,7 @@ sed -i 's/\.sp//' `echo $^ | sed -e 's/.txt//'` gzip -f --best `echo $^ |sed -e 's/.txt//'` -MANPAGES = grml-autoconfig.1 grml-autoconfig.8 grml-bootsplash.1 restore-config.1 save-config.1 +MANPAGES = grml-autoconfig.1 grml-autoconfig.8 restore-config.1 save-config.1 all: doc diff --git a/doc/grml-bootsplash.1.txt b/doc/grml-bootsplash.1.txt deleted file mode 100644 index f1edc85..0000000 --- a/doc/grml-bootsplash.1.txt +++ /dev/null @@ -1,44 +0,0 @@ -grml-bootsplash(1) -================== - -Name ----- -grml-bootsplash - script and configuration framework for the grml system - -Synopsis --------- - -grml-bootsplash "||..." - -About ------ - -'grml-bootsplash' provides a text-based simple bootsplash. It is integrated -within the grml-autoconfig(1) framework. You very probably won't need it -otherwise, this manpage just documents what grml-bootsplash does. - -Options -------- - -The program grml-bootsplash does not support any options besides the "||..." -sequence. If you want to specify first status of bootsplash use -'grml-bootsplash "|"'. To specify the last status of bootsplash use -'grml-bootsplash "||||||||||||"' (that's 12 '|'). The maximum number of -supported "|" signs is twelve and will be used automatically if more are -specified. - -Bugs ----- -If you find a bug please report it. See link:http://grml.org/bugs/[] for details -about how to report bugs. - -See also --------- -grml-autoconfig(1), grml-autoconfig(8), restore-config(1) - -Authors -------- - -grml-bootsplash was written by Michael Prokop and Florian Keller -. This manual page was written by Michael Prokop - for the grml project (but may be used by others). diff --git a/grml-autoconfig b/grml-autoconfig index 192ebf7..7ef820e 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -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,24 +120,16 @@ 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 && config_acpi -[ -n "$SPLASH" ] && /usr/bin/grml-bootsplash "||||||">/dev/tty14 - checkvalue $CONFIG_DMA && config_dma 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 @@ -176,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 @@ -192,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 @@ -204,8 +176,6 @@ 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 @@ -220,11 +190,6 @@ 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_DEBOOTSTRAP && config_debootstrap @@ -233,10 +198,8 @@ 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 diff --git a/grml-bootsplash b/grml-bootsplash deleted file mode 100755 index 6eeb8f9..0000000 --- a/grml-bootsplash +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# Filename: grml-bootsplash -# Purpose: simple text based bootsplash -# Authors: (c) Florian Keller , (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2. -################################################################################ - -if [ -z "$1" ] ; then - STATUS='| not set ||' -else - STATUS="$1" # maximum: 12 '|' -fi - -COUNT=$(echo -n "$STATUS" | wc -c) - -if [ "$COUNT" -gt 12 ] ; then - COUNT=12 # more than 12 characters are not supported - STATUS="||||||||||||" -fi - -PLACEHOLDER="" -BOOTSPLASH=$(mktemp) - -echo -ne '\033[H\033[25l' -cat > $BOOTSPLASH << 'EOTA' - - - - - .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | _______ | || | ____ ____ | || | _____ | | -| | .' ___ | | || | |_ __ \ | || ||_ \ / _|| || | |_ _| | | -| | / .' \_| | || | | |__) | | || | | \/ | | || | | | | | -| | | | ____ | || | | __ / | || | | |\ /| | | || | | | _ | | -| | \ `.___] _| | || | _| | \ \_ | || | _| |_\/_| |_ | || | _| |__/ | | | -| | `._____.' | || | |____| |___| | || ||_____||_____|| || | |________| | | -| | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' - - _______________________________________________________________________ - | | - | .''''. | - | _.-'/ | \ | - | , _.-" ,| / a `-. | - | |\ .-" `--""-.__.'==========================-, | - | \ '-'` .___.--._)==============================| | - | \ .' | | | - | | /,_.-' | Loading grml system ... | | - | _/ _.'( | (press alt+f1 to exit splash) | | - | / ,-' \ \ | | | -EOTA - - - -echo -n " | \ \ \`-' | 0% -[" >> $BOOTSPLASH -echo -en "$STATUS" >> $BOOTSPLASH - -COUNT=$(expr 13 - $COUNT) -for (( i=1 ; i < ${COUNT} ; i++ )); do - PLACEHOLDER="$PLACEHOLDER " -done - -echo -n "$PLACEHOLDER" >> $BOOTSPLASH -echo "]- 100% | |" >> $BOOTSPLASH - -cat >> $BOOTSPLASH << 'EOTA' - | `-' '-------------------------------' | - | | - | | - | | - |_______________________________________________________________________| - - - - - - -EOTA - -cat $BOOTSPLASH -rm -f $BOOTSPLASH &>/dev/null - -## END OF FILE #################################################################