From 5e1fad036d0d88f4ed2531a684b16948ae6f6eea Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 10 Jul 2011 17:05:20 +0200 Subject: [PATCH] Revert "rc: restart plymouthd if it crashed" This reverts commit dd0ecf1203936e842b1f1d74c93edfa9dcdaa35e. --- etc/rc.d/init.d/mountproc | 1 + etc/rc.d/init.d/rc | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/etc/rc.d/init.d/mountproc b/etc/rc.d/init.d/mountproc index 7329f59..36a8d13 100755 --- a/etc/rc.d/init.d/mountproc +++ b/etc/rc.d/init.d/mountproc @@ -21,6 +21,7 @@ fi progress=5 $PLYMOUTH message --text=$"System booting, please wait..." +$PLYMOUTH update --status="$progress" if [ ! -e /sys/kernel ]; then echo -n "Mounting sys file system: " diff --git a/etc/rc.d/init.d/rc b/etc/rc.d/init.d/rc index 183507d..e8c0380 100755 --- a/etc/rc.d/init.d/rc +++ b/etc/rc.d/init.d/rc @@ -64,12 +64,6 @@ if [ "$runlevel" = "0" -o "$runlevel" = "6" ]; then fi else $PLYMOUTH message --text=$"Starting services..." - $PLYMOUTH --ping || { - # workaround for plymouth crashing - $PLYMOUTHD --attach-to-session - $PLYMOUTH --show-splash - $PLYMOUTH message --text=$"Starting services..." - } fi allservicesnum=`ls -1 $rc_base/rc$runlevel.d/[S,K]* 2>/dev/null | wc -l`