diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-28 04:49:54 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2011-09-28 04:49:54 +0200 |
| commit | 8e87030d555a647d4e653c5d42016157d6f11a16 (patch) | |
| tree | e39707fb2145fa1db5fffe9c3d8bc129041e09a3 /config | |
| parent | add6a0352c68a0880092883f53cfb5bf0f32312b (diff) | |
| download | kanotix-8e87030d555a647d4e653c5d42016157d6f11a16.zip kanotix-8e87030d555a647d4e653c5d42016157d6f11a16.tar.gz | |
replaced wrong patch from last commit
Diffstat (limited to 'config')
| -rw-r--r-- | config/chroot_local-patches/kdm_plymouth_hack.patch | 18 |
1 files 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 |