diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-28 04:06:21 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-28 04:06:21 +0200 |
| commit | add6a0352c68a0880092883f53cfb5bf0f32312b (patch) | |
| tree | 20ffcd76e188458a6e67da6cfd3a8acd7df307b8 /config | |
| parent | 186780d61f2a148b3c4af09a45f79fa04beaa07d (diff) | |
| download | kanotix-add6a0352c68a0880092883f53cfb5bf0f32312b.zip kanotix-add6a0352c68a0880092883f53cfb5bf0f32312b.tar.gz | |
KDM-plymouth-hack: removed second wait-step
Diffstat (limited to 'config')
| -rw-r--r-- | config/chroot_local-patches/kdm_plymouth_hack.patch | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/config/chroot_local-patches/kdm_plymouth_hack.patch b/config/chroot_local-patches/kdm_plymouth_hack.patch index 2dcdb44..3b81a1a 100644 --- a/config/chroot_local-patches/kdm_plymouth_hack.patch +++ b/config/chroot_local-patches/kdm_plymouth_hack.patch @@ -1,15 +1,11 @@ ---- /build/kanotix/chroot/etc/init.d/kdm 2011-02-12 20:16:11.000000000 +0100 -+++ /etc/init.d/kdm 2011-08-09 22:24:34.401667838 +0200 -@@ -126,6 +126,12 @@ - [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - log_action_msg "Not starting K Display Manager (kdm); it is not the default display manager." - else -+ log_action_msg "Killing plymouth..." -+ if pidof plymouthd >/dev/null; then -+ /bin/plymouth --quit --wait -+ /bin/plymouth --wait -+ sleep 1 -+ fi +--- /build/kanotix/chroot/etc/init.d/kdm 2011-09-28 03:04:16.794899000 +0200 ++++ /etc/init.d/kdm 2011-09-28 04:05:22.977140278 +0200 +@@ -129,8 +129,6 @@ + log_action_msg "Killing plymouth..." + if pidof plymouthd >/dev/null; then + /bin/plymouth --quit --wait +- /bin/plymouth --wait +- sleep 1 + fi log_daemon_msg "Starting K Display Manager" "kdm" if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG ; then - log_end_msg 0 |