From 679899f0e035198139e5abd14959ee54a697a060 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Mon, 26 Dec 2011 14:07:12 +0100
Subject: [PATCH] rc: quit plymouth before X starts when plymouth was restarted
 due to crash on some various hardware to prevent the 'ENTER' and '2' keys
 crash bug from happening

---
 etc/rc.d/init.d/rc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/etc/rc.d/init.d/rc b/etc/rc.d/init.d/rc
index 0e834ce..a84a93e 100755
--- a/etc/rc.d/init.d/rc
+++ b/etc/rc.d/init.d/rc
@@ -59,6 +59,7 @@ export RUNLEVEL
 # workaround for plymouthd stopping at runlevel change with non-KMS drivers
    $PLYMOUTHD --attach-to-session --pid-file /run/plymouth/pid
    $PLYMOUTH --show-splash
+   WORKAROUND=1
 }
 
 [ "$previous" != "N" ] && progressbase=10 || progressbase=65
@@ -156,5 +157,11 @@ if [ ! "$runlevel" = "5" ]; then
    $PLYMOUTH quit
 else
    $PLYMOUTH message --text=""
-   [ -e /run/plymouth/pid ] && touch /var/spool/gdm/force-display-on-active-vt
+   if [ "$WORKAROUND" ]; then
+      # FIXME: when plymouth crashes and is restarted above the ENTER key X restart bug
+      # comes back if not quit
+      $PLYMOUTH quit
+   else
+      [ -e /run/plymouth/pid ] && touch /var/spool/gdm/force-display-on-active-vt
+   fi
 fi