From 72dd02561638c16c4083a47aabb67cf6b2022be6 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 9 Dec 2011 16:09:52 +0100
Subject: [PATCH] console: fix plymouthd check

---
 etc/rc.d/init.d/console | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/etc/rc.d/init.d/console b/etc/rc.d/init.d/console
index 0411fa6..b555b0b 100755
--- a/etc/rc.d/init.d/console
+++ b/etc/rc.d/init.d/console
@@ -4,28 +4,34 @@
 . $rc_functions
 
 INITTY="0 1 2 3 4 5 6"
+PLYMOUTHD=/sbin/plymouthd
+PLYMOUTH=/bin/plymouth
 
 [ -c /dev/zero ] || mknod -m 0666 /dev/zero c 1 5
 [ -c /dev/ptmx ] || mknod -m 0666 /dev/ptmx c 5 2
 for tty in 0 1 2 3 4 5 6; do
    [ -c /dev/tty$tty ] || mknod -m 0620 /dev/tty$tty c 4 $tty
 done
-[ -e /dev/systty ] || ln -s tty0 /dev/systty
-[ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
-[ -e /dev/fb ] || ln -s fb0 /dev/fb
 
 echo -n "Setting i18n, keyboard and console: "
 for tty in $INITTY; do
    /sbin/console_init tty$tty
 done
+evaluate_retval
+echo
 
 [ -e $PLYMOUTHD ] || exit 0
 
 # do nothing if plymouth was already started in initramfs
-pidof $PLYMOUTHD >/dev/null && exit 0
+pidof plymouthd >/dev/null && exit 0
 
 echo -n "Starting plymouth daemon: "
-mkdir -m 0755 /run/plymouth
+
+[ -e /dev/systty ] || ln -s tty0 /dev/systty
+[ -c /dev/fb0 ] || mknod -m 0660 /dev/fb0 c 29 0
+[ -e /dev/fb ] || ln -s fb0 /dev/fb
+
+mkdir -p -m 0755 /run/plymouth
 $PLYMOUTHD --attach-to-session --pid-file /run/plymouth/pid
 evaluate_retval
 echo