aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-08-15 16:23:38 -0400
committerBill Nottingham <notting@redhat.com>2011-08-15 16:23:38 -0400
commit19ea300575c00132cf576ae0f8ef99f0c78f20d1 (patch)
tree3bba07388ef8b256ec3c704622cd7ce7b99590cf
parent4ee50f81e1f2f78af3298439ab8a9d9d96aa4d18 (diff)
downloadinitscripts-19ea300575c00132cf576ae0f8ef99f0c78f20d1.tar
initscripts-19ea300575c00132cf576ae0f8ef99f0c78f20d1.tar.gz
initscripts-19ea300575c00132cf576ae0f8ef99f0c78f20d1.tar.bz2
initscripts-19ea300575c00132cf576ae0f8ef99f0c78f20d1.tar.xz
initscripts-19ea300575c00132cf576ae0f8ef99f0c78f20d1.zip
plymouth lives in /bin. (#702814)
-rw-r--r--init/quit-plymouth.conf2
-rw-r--r--rc.d/init.d/functions10
-rwxr-xr-xrc.d/init.d/netfs4
-rwxr-xr-xrc.d/rc.sysinit10
-rwxr-xr-xsystemd/fedora-autorelabel2
-rwxr-xr-xsystemd/fedora-configure4
6 files changed, 16 insertions, 16 deletions
diff --git a/init/quit-plymouth.conf b/init/quit-plymouth.conf
index 7f28391e..7a67b071 100644
--- a/init/quit-plymouth.conf
+++ b/init/quit-plymouth.conf
@@ -10,5 +10,5 @@ start on runlevel S or stopping rc RUNLEVEL=[234]
task
script
- /usr/bin/plymouth quit || :
+ /bin/plymouth quit || :
end script
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 1b0b4843..79545b51 100644
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -546,8 +546,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
}
@@ -562,7 +562,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
}
@@ -601,7 +601,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
@@ -609,7 +609,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
diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs
index ae708eab..4358572d 100755
--- a/rc.d/init.d/netfs
+++ b/rc.d/init.d/netfs
@@ -78,8 +78,8 @@ case "$1" in
fi
if [ "$rc" -gt 1 ]; then
- if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping ; then
- /usr/bin/plymouth --hide-splash
+ if [ -x /bin/plymouth ] && /bin/plymouth --ping ; then
+ /bin/plymouth --hide-splash
fi
failure "$STRING"
tty >/dev/null 2>&1 || exit 1
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index c572384a..fd907f4a 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -32,7 +32,7 @@ fi
. /etc/init.d/functions
PLYMOUTH=
-[ -x /usr/bin/plymouth ] && PLYMOUTH=yes
+[ -x /bin/plymouth ] && PLYMOUTH=yes
# Check SELinux status
SELINUX_STATE=
@@ -545,8 +545,8 @@ fi
# Configure machine if necessary.
if [ -f /.unconfigured ]; then
- if [ -x /usr/bin/plymouth ]; then
- /usr/bin/plymouth quit
+ if [ -x /bin/plymouth ]; then
+ /bin/plymouth quit
fi
if [ -x /usr/bin/system-config-keyboard ]; then
@@ -660,7 +660,7 @@ if strstr "$cmdline" confirm ; then
fi
# Let rhgb know that we're leaving rc.sysinit
-if [ -x /usr/bin/plymouth ]; then
- /usr/bin/plymouth --sysinit
+if [ -x /bin/plymouth ]; then
+ /bin/plymouth --sysinit
fi
diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel
index dad7a91f..70ece423 100755
--- a/systemd/fedora-autorelabel
+++ b/systemd/fedora-autorelabel
@@ -11,7 +11,7 @@ relabel_selinux() {
AUTORELABEL=
. /etc/selinux/config
echo "0" > /selinux/enforce
- [ -x /usr/bin/plymouth ] && plymouth --hide-splash
+ [ -x /bin/plymouth ] && plymouth --hide-splash
if [ "$AUTORELABEL" = "0" ]; then
echo
diff --git a/systemd/fedora-configure b/systemd/fedora-configure
index d1e4dbd3..43f17ca3 100755
--- a/systemd/fedora-configure
+++ b/systemd/fedora-configure
@@ -4,8 +4,8 @@
. /etc/init.d/functions
-if [ -x /usr/bin/plymouth ]; then
- /usr/bin/plymouth quit
+if [ -x /bin/plymouth ]; then
+ /bin/plymouth quit
fi
if [ -x /usr/sbin/firstboot ]; then