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

This commit is contained in:
Silvan Calarco 2011-12-26 14:07:12 +01:00
parent 17dd4d7fe9
commit 679899f0e0

View File

@ -59,6 +59,7 @@ export RUNLEVEL
# workaround for plymouthd stopping at runlevel change with non-KMS drivers # workaround for plymouthd stopping at runlevel change with non-KMS drivers
$PLYMOUTHD --attach-to-session --pid-file /run/plymouth/pid $PLYMOUTHD --attach-to-session --pid-file /run/plymouth/pid
$PLYMOUTH --show-splash $PLYMOUTH --show-splash
WORKAROUND=1
} }
[ "$previous" != "N" ] && progressbase=10 || progressbase=65 [ "$previous" != "N" ] && progressbase=10 || progressbase=65
@ -156,5 +157,11 @@ if [ ! "$runlevel" = "5" ]; then
$PLYMOUTH quit $PLYMOUTH quit
else else
$PLYMOUTH message --text="" $PLYMOUTH message --text=""
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 [ -e /run/plymouth/pid ] && touch /var/spool/gdm/force-display-on-active-vt
fi
fi fi