Merge remote-tracking branch 'origin/testing' into testing

Conflicts:
	abs/core/LinHES-config/PKGBUILD

1 files changed, 21 insertions, 14 deletions

diff --git a/abs/core/fbsplash/splash.conf b/abs/core/fbsplash/splash.conf
index 5360792..44fed88 100644
--- a/abs/core/fbsplash/splash.conf
+++ b/abs/core/fbsplash/splash.conf
@@ -2,37 +2,44 @@
 # /etc/conf.d/splash
 #
 
+####  WARNING!
+## This file is also sourced in the initcpio hook.
+## No BASH-code (like arrays) is allowed here!
+
 ####  initcpio and Fbsplash daemon  ##########################################
 
 ## Themes to include into initcpio
 ## For a smaller initcpio you may try theme cfg files instead of directories.
-SPLASH_THEMES=(
+SPLASH_THEMES="
     linhes
-    linhes/1024x768.cfg
-    linhes/800x600.cfg
-)
+"
 
 ## Override the initial silent splash screen status message defaults.
 ## Note: '$progress' will be replaced by Fbsplash itself.
 ## * initcpio - (no effect with fbcondecor kernel)
-SPLASH_INIT_MESSAGE="Initializing the kernel"
+SPLASH_INIT_MESSAGE="Initializing the kernel..."
 ## * bootup
-SPLASH_BOOT_MESSAGE="Booting '$HOSTNAME' (\$progress%)"
+SPLASH_BOOT_MESSAGE="Booting $HOSTNAME..."
 ## * reboot
-SPLASH_REBOOT_MESSAGE="Rebooting '$HOSTNAME' (\$progress%)"
+SPLASH_REBOOT_MESSAGE="Rebooting $HOSTNAME..."
 ## * shutdown
-SPLASH_SHUTDOWN_MESSAGE="Shutting down '$HOSTNAME' (\$progress%)"
+SPLASH_SHUTDOWN_MESSAGE="Shutting down $HOSTNAME..."
 
-## To show animations early, include the Fbsplash daemon (1.5 MiB) into initcpio, too,
+## Include and use the Fbsplash daemon (1.5 MiB) in the initcpio
 ## instead of the small helper only.
-## Note: Themes with 'scripts/rc_init-pre' like 'arch-banner-icons' are not supported.
+## Usefull to show animations early.
+## Note: Themes with 'scripts/rc_init-pre' like 'arch-banner-icons' are
+##       supported now if fbsplash-extras>=2.0.10 is installed, but there
+##       might still be some sophisticated ones which break when using this.
 SPLASH_DAEMON="early"
 
 ## Make the splash daemon use fade effects.
 ## Note: The initcpio helper does only use the kernel parameter!
+# Just use fadein on bootup and fadeout on shutdown/reboot
+#case $PREVLEVEL in  N   ) SPLASH_EFFECTS="fadein" ; esac
+#case  $RUNLEVEL in [06] ) SPLASH_EFFECTS="fadeout"; esac
+# Uncomment this line to allways use both
 # SPLASH_EFFECTS="fadein,fadeout"
-## Uggly hack to get that in from the kernel line :p
-SPLASH_EFFECTS=$(e=();IFS=',';for w in $splash;do [[ $w == fade* ]]&&e+=($w);done;echo "${e[*]}")
 
 ## Enable the textbox when starting the Fbsplash daemon.
 ## Useful if the theme provides a message log or other textbox.
@@ -52,8 +59,8 @@ SPLASH_AUTOVERBOSE=0
 SPLASH_VERBOSE_ON_ERRORS="no"
 
 ## Name of the DAEMONS script starting Xorg if any
-## Set this to avoid virtual terminal change struggle between Xorg and Fbsplash.
-SPLASH_XSERVICE="gdm"
+## Set this to avoid virtual terminal change struggle between X and Fbsplash.
+#SPLASH_XSERVICE="gdm"
 #SPLASH_XSERVICE="kdm"
 #SPLASH_XSERVICE="xdm"
 #SPLASH_XSERVICE="lxdm"