From c8997ce656456d9ab336d143047c70be09cbfdec Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 15 Aug 2011 16:23:38 -0400
Subject: plymouth lives in /bin. (#702814)

Conflicts:

	rc.d/rc.sysinit
---
 rc.d/init.d/functions | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'rc.d/init.d/functions')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 8df93d06..f1fff775 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -492,8 +492,8 @@ echo_warning() {
 
 # Inform the graphical boot of our current state
 update_boot_stage() {
-  if [ -x /usr/bin/plymouth ]; then
-      /usr/bin/plymouth --update="$1"
+  if [ -x /bin/plymouth ]; then
+      /bin/plymouth --update="$1"
   fi
   return 0
 }
@@ -508,7 +508,7 @@ success() {
 failure() {
   local rc=$?
   [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure
-  [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --details
+  [ -x /bin/plymouth ] && /bin/plymouth --details
   return $rc
 }
 
@@ -547,7 +547,7 @@ strstr() {
 
 # Confirm whether we really want to run this service
 confirm() {
-  [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash
+  [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
   while : ; do 
       echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] "
       read answer
@@ -555,7 +555,7 @@ confirm() {
          return 0
       elif strstr $"cC" "$answer" ; then
 	 rm -f /var/run/confirm
-	 [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --show-splash
+	 [ -x /bin/plymouth ] && /bin/plymouth --show-splash
          return 2
       elif strstr $"nN" "$answer" ; then
          return 1
-- 
cgit v1.2.1