From 8e87030d555a647d4e653c5d42016157d6f11a16 Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Wed, 28 Sep 2011 04:49:54 +0200
Subject: replaced wrong patch from last commit
---
config/chroot_local-patches/kdm_plymouth_hack.patch | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/config/chroot_local-patches/kdm_plymouth_hack.patch b/config/chroot_local-patches/kdm_plymouth_hack.patch
index 3b81a1a..6539f3c 100644
--- a/config/chroot_local-patches/kdm_plymouth_hack.patch
+++ b/config/chroot_local-patches/kdm_plymouth_hack.patch
@@ -1,11 +1,13 @@
---- /build/kanotix/chroot/etc/init.d/kdm 2011-09-28 03:04:16.794899000 +0200
+--- /build/kanotix/chroot/etc/init.d/kdm 2011-02-12 20:16:11.000000000 +0100
+++ /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
+@@ -126,6 +126,10 @@
+ [ "$(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
++ fi
log_daemon_msg "Starting K Display Manager" "kdm"
if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG ; then
+ log_end_msg 0
--
cgit v1.0