diff options
| author | James Meyer <james.meyer@operamail.com> | 2012-12-09 23:57:22 (GMT) |
|---|---|---|
| committer | James Meyer <james.meyer@operamail.com> | 2012-12-09 23:57:22 (GMT) |
| commit | 7b7804b4e5f46623794208d5dbcfe43c57a7e7a4 (patch) | |
| tree | 465124768864f5971983f9f1b43a677ef1b31bd4 /abs/core/plymouth/plymouth.functions | |
| parent | 53a9bfc6166ef4181ddc5797c6b3a0c441887585 (diff) | |
| download | linhes_pkgbuild-7b7804b4e5f46623794208d5dbcfe43c57a7e7a4.zip linhes_pkgbuild-7b7804b4e5f46623794208d5dbcfe43c57a7e7a4.tar.gz linhes_pkgbuild-7b7804b4e5f46623794208d5dbcfe43c57a7e7a4.tar.bz2 | |
plymouth: shutdown stalls when plymouth is running during shutdown. The short term solution is to run plymouth only on startup and don't restart on shutdown.
refs #871
Diffstat (limited to 'abs/core/plymouth/plymouth.functions')
| -rw-r--r-- | abs/core/plymouth/plymouth.functions | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/abs/core/plymouth/plymouth.functions b/abs/core/plymouth/plymouth.functions index b866643..cfaa19b 100644 --- a/abs/core/plymouth/plymouth.functions +++ b/abs/core/plymouth/plymouth.functions @@ -1,3 +1,4 @@ +#!/bin/bash if [[ -x /usr/bin/plymouth && -x /usr/sbin/plymouthd ]]; then ply_client() { /usr/bin/plymouth --ping && /usr/bin/plymouth "$@"; } @@ -20,7 +21,8 @@ if [[ -x /usr/bin/plymouth && -x /usr/sbin/plymouthd ]]; then } stat_fail() { - ply_client --quit + #JM remove client quitting + #ply_client --quit std_stat_fail "$@" } @@ -39,7 +41,7 @@ if [[ -x /usr/bin/plymouth && -x /usr/sbin/plymouthd ]]; then ply_quit_boot [[ $(ps h $(cat /tmp/plymouthd)) ]] && kill -9 $(cat /tmp/plymouthd) } - add_hook shutdown_poweroff ply_quit_shutdown +# JM add_hook shutdown_poweroff ply_quit_shutdown # start plymouth at the beginning of rc.shutdown ply_shutdown_start(){ @@ -59,7 +61,8 @@ if [[ -x /usr/bin/plymouth && -x /usr/sbin/plymouthd ]]; then # don't get killed by kill_all add_omit_pids `cat /tmp/plymouthd` } - add_hook shutdown_start ply_shutdown_start +#remove shutdown hook so plymouth doesn't start +#JM add_hook shutdown_start ply_shutdown_start fi # vim: set ts=2 sw=2 ft=sh noet: |