summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Loibl <andreas@andreas-loibl.de>2011-09-28 02:24:41 +0200
committerAndreas Loibl <andreas@andreas-loibl.de>2011-09-28 02:24:41 +0200
commit4e66caa70ded1c82c4dcb34ef6f5da837e117f74 (patch)
tree15eb646e177c49ee2256280dd86b0416ab9ad9f5
parentbb5ed6d6272780f310b8d6ddd356a38742aef809 (diff)
downloadkanotix-4e66caa70ded1c82c4dcb34ef6f5da837e117f74.zip
kanotix-4e66caa70ded1c82c4dcb34ef6f5da837e117f74.tar.gz
added KDM-plymouth-hack to make sure that plymouth is not running anymore when starting KDM
-rw-r--r--config/chroot_local-patches/kdm_plymouth_hack.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/config/chroot_local-patches/kdm_plymouth_hack.patch b/config/chroot_local-patches/kdm_plymouth_hack.patch
new file mode 100644
index 0000000..2dcdb44
--- /dev/null
+++ b/config/chroot_local-patches/kdm_plymouth_hack.patch
@@ -0,0 +1,15 @@
+--- /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
+ log_daemon_msg "Starting K Display Manager" "kdm"
+ if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG ; then
+ log_end_msg 0