summaryrefslogtreecommitdiffstats
path: root/move/tree/mdk_totem
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-06-15 10:29:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-06-15 10:29:18 +0000
commit2ace1ea3a747da72321c6b40feb8a48dfe334989 (patch)
treefe28561ee68c0b2c68e884cf978755766249795b /move/tree/mdk_totem
parent447d889a17de502a2f5488dab81d5243cf3c3f9d (diff)
downloaddrakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.gz
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.bz2
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.tar.xz
drakx-2ace1ea3a747da72321c6b40feb8a48dfe334989.zip
kill kde desktop and kicker when mdk_totem is launched, then restore them
(kded pb still there?)
Diffstat (limited to 'move/tree/mdk_totem')
-rwxr-xr-xmove/tree/mdk_totem6
1 files changed, 3 insertions, 3 deletions
diff --git a/move/tree/mdk_totem b/move/tree/mdk_totem
index ca172baa2..2c8888562 100755
--- a/move/tree/mdk_totem
+++ b/move/tree/mdk_totem
@@ -28,8 +28,7 @@ sub busy_pids_and_files() {
sub remove_simple_daemons {
my (@busy) = @_;
foreach (@busy) {
- $_->{to_restart} = 'kdeinit kicker' if $_->{cmdline} =~ m!\b(kicker)\b!;
- $_->{to_kill} = $_->{cmdline} =~ m!\b(kdesud|kded|kio_uiserver|klaptopdaemon|artsd|portmap)\b!;
+ $_->{to_kill} = $_->{cmdline} =~ m!\b(kdesud|kded|kdesktop|kicker|kio_uiserver|klaptopdaemon|artsd|portmap)\b!;
}
my @auto_killed = grep { $_->{to_restart} || $_->{to_kill} } @busy;
@@ -115,5 +114,6 @@ if (my $pid = fork()) {
exec 'sudo', 'mdk_behind_totem',
'--boot-loop', $file2loop{'live_tree_boot.clp'},
'--main-loop', $file2loop{'live_tree.clp'},
- '--totem-pid', $totem_pid;
+ '--totem-pid', $totem_pid,
+ '--user', $ENV{USER};
}