diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-08-15 16:23:38 -0400 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2011-08-16 13:23:46 +0200 |
| commit | c8997ce656456d9ab336d143047c70be09cbfdec (patch) | |
| tree | 314262702c25b9b96f8085f1917c412705c90354 | |
| parent | 3aebd8fbda1a7db5fc345474825e25de5b08f4e7 (diff) | |
| download | initscripts-c8997ce656456d9ab336d143047c70be09cbfdec.tar initscripts-c8997ce656456d9ab336d143047c70be09cbfdec.tar.gz initscripts-c8997ce656456d9ab336d143047c70be09cbfdec.tar.bz2 initscripts-c8997ce656456d9ab336d143047c70be09cbfdec.tar.xz initscripts-c8997ce656456d9ab336d143047c70be09cbfdec.zip | |
plymouth lives in /bin. (#702814)
Conflicts:
rc.d/rc.sysinit
| -rw-r--r-- | init/quit-plymouth.conf | 2 | ||||
| -rwxr-xr-x | prefdm | 2 | ||||
| -rw-r--r-- | rc.d/init.d/functions | 10 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 4 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 11 |
5 files changed, 15 insertions, 14 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 @@ -29,7 +29,7 @@ else fi # shut down boot splash -/usr/bin/plymouth quit $quit_arg +/bin/plymouth quit $quit_arg shopt -s execfail 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 diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 44f6d684..568a9ba7 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 2c07a811..de26855d 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -29,7 +29,7 @@ fi . /etc/init.d/functions PLYMOUTH= -[ -x /usr/bin/plymouth ] && PLYMOUTH=yes +[ -x /bin/plymouth ] && PLYMOUTH=yes # Check SELinux status SELINUX_STATE= @@ -538,8 +538,9 @@ fi # Configure machine if necessary. if [ -f /.unconfigured ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --quit + + if [ -x /bin/plymouth ]; then + /bin/plymouth quit fi if [ -x /usr/bin/system-config-keyboard ]; then @@ -657,7 +658,7 @@ if strstr "$cmdline" confirm ; then fi # Let rhgb know that we're leaving rc.sysinit -if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --sysinit +if [ -x /bin/plymouth ]; then + /bin/plymouth --sysinit fi |