diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-09-23 15:43:44 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-09-23 15:43:44 -0400 |
| commit | d027a8366d22b2aa7a54ef8c030fff4024bdd5b9 (patch) | |
| tree | 8f9c0dd361de069ef36a4dfd76533c44341d640c | |
| parent | f9cfaa365ee15b7cb4585f5220702ac5f39c2743 (diff) | |
| download | initscripts-d027a8366d22b2aa7a54ef8c030fff4024bdd5b9.tar initscripts-d027a8366d22b2aa7a54ef8c030fff4024bdd5b9.tar.gz initscripts-d027a8366d22b2aa7a54ef8c030fff4024bdd5b9.tar.bz2 initscripts-d027a8366d22b2aa7a54ef8c030fff4024bdd5b9.tar.xz initscripts-d027a8366d22b2aa7a54ef8c030fff4024bdd5b9.zip | |
Just use plymouth directly, not the rhgb-client wrapper.
This fixes the fact that the semantics of --details changed.
| -rwxr-xr-x | rc.d/init.d/functions | 10 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index a682f5d8..7a66840c 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -453,8 +453,8 @@ echo_warning() { # Inform the graphical boot of our current state update_boot_stage() { - if [ -x /usr/bin/rhgb-client ]; then - /usr/bin/rhgb-client --update="$1" + if [ -x /usr/bin/plymouth ]; then + /usr/bin/plymouth --update="$1" fi return 0 } @@ -469,7 +469,7 @@ success() { failure() { local rc=$? [ "$BOOTUP" != "verbose" -a -z "${LSB:-}" ] && echo_failure - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --details return $rc } @@ -508,7 +508,7 @@ strstr() { # Confirm whether we really want to run this service confirm() { - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=yes + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --hide-splash while : ; do echo -n $"Start service $1 (Y)es/(N)o/(C)ontinue? [Y] " read answer @@ -516,7 +516,7 @@ confirm() { return 0 elif strstr $"cC" "$answer" ; then rm -f /var/run/confirm - [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --details=no + [ -x /usr/bin/plymouth ] && /usr/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 0a30f0e6..4a568095 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -70,11 +70,11 @@ case "$1" in fi if [ "$rc" -gt 1 ]; then - if [ -x /usr/bin/rhgb-client ] && /usr/bin/rhgb-client --ping ; then - /usr/bin/rhgb-client --details=yes >/dev/null 2>&1 + if [ -x /usr/bin/plymouth ] && /usr/bin/plymouth --ping ; then + /usr/bin/plymouth --hide-splash fi -` ` failure "$STRING" -` ` tty >/dev/null 2>&1 || exit 1 + failure "$STRING" + tty >/dev/null 2>&1 || exit 1 echo echo echo $"*** An error occurred during the file system check." |