diff -ruw fbsplash.orig//PKGBUILD fbsplash//PKGBUILD
--- fbsplash.orig//PKGBUILD 2011-07-12 18:34:08.000000000 +0200
+++ fbsplash//PKGBUILD 2011-07-13 10:22:03.000000000 +0200
@@ -3,7 +3,7 @@
pkgname=fbsplash
pkgver=1.5.4.4
-pkgrel=4
+pkgrel=5
pkgdesc="A userspace implementation of a splash screen for Linux (formerly known as gensplash)"
arch=('i686' 'x86_64')
url="http://fbsplash.berlios.de"
@@ -28,9 +28,9 @@
md5sums=('2a16704c4adde97b58812cd89e3f2342'
'4045e315c52f5a576fca4f7e634eeb91'
'90708a96038d7d7921c2e9fde938c058'
- '40622506e64a0919e831d3dc3a6ae230'
+ 'a6b0b9c5c7a460380a7db127e0278164'
'24e2a7bbc2d18fe3ec10093665cd7a6e'
- 'c2b2803264b412646bf3453bcd60fb34'
+ '4a3ac992a5042fa9770cbd3fdb7e1465'
'715926469d05eecd345c052e6248ca32'
'b3db9d4fd902b62ac9e38589677e2d16')
diff -ruw fbsplash.orig//fbsplash-basic.sh fbsplash//fbsplash-basic.sh
--- fbsplash.orig//fbsplash-basic.sh 2011-06-22 12:30:23.000000000 +0200
+++ fbsplash//fbsplash-basic.sh 2011-07-13 10:19:25.000000000 +0200
@@ -40,8 +40,8 @@
# Prevent splash destruction
CONSOLEFONT=""
# Continue to use a splash daamon started in initcpio
- if /bin/mountpoint -q /dev/.splash-cache; then
- /bin/mount --move /dev/.splash-cache $spl_cachedir || return
+ if /bin/mountpoint -q /run/.splash-cache; then
+ /bin/mount --move /run/.splash-cache $spl_cachedir || return
splash_comm_send set message "$SPLASH_BOOT_MESSAGE"
# Mount a tmpfs
else
diff -ruw fbsplash.orig//fbsplash.initcpio_hook fbsplash//fbsplash.initcpio_hook
--- fbsplash.orig//fbsplash.initcpio_hook 2011-07-12 18:32:55.000000000 +0200
+++ fbsplash//fbsplash.initcpio_hook 2011-07-13 10:13:48.000000000 +0200
@@ -12,31 +12,31 @@
# Start the daemon here if possible
# to show animations early and gain some bootup speed
- if [ -x /sbin/fbsplashd.static ]; then
+ if [ -x "$spl_daemon" ]; then
msg "Starting Fbsplash Daemon"
set -e
- # Mount the cache within /dev to get it moved to the new root
- mkdir /dev/.splash-cache
- ( spl_cachedir=/dev/.splash-cache; splash_cache_prep )
+ # Mount the cache within /run to get it moved to the new root
+ mkdir /run/.splash-cache
+ ( spl_cachedir=/run/.splash-cache; splash_cache_prep )
# Take over any existing cache content
mkdir -p $spl_cachedir
parent=$( dirname $spl_cachedir )
mv $spl_cachedir $parent/.splash-cache
- cp -a $parent/.splash-cache /dev/
+ cp -a $parent/.splash-cache /run/
# Symlink for starting the daemon
- ln -s /dev/.splash-cache $spl_cachedir
+ ln -s /run/.splash-cache $spl_cachedir
# Wait for any fbcondecor fadein - may take very long on some broken systems
i=0
while [ -n "$( pidof fbcondecor_helper )" ]; do
if [ $i -ge 50 ]; then
- error "timeout on waiting for fbcondecor_helper to die!"
+ err "timeout on waiting for fbcondecor_helper to die!"
exit 1
fi
sleep .1
i=$(( i + 1 ))
done
# Actually start the daemon
- cd /dev/.splash-cache
+ cd /run/.splash-cache
set +e
SPLASH_BOOT_MESSAGE="${SPLASH_INIT_MESSAGE}"
splash_start && sleep .1 # allow the daemon to open the event dev