diff options
Diffstat (limited to 'move/tree')
| -rwxr-xr-x | move/tree/mdk_behind_totem | 11 | ||||
| -rwxr-xr-x | move/tree/mdk_totem | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/move/tree/mdk_behind_totem b/move/tree/mdk_behind_totem index 62618ea93..3cd68f788 100755 --- a/move/tree/mdk_behind_totem +++ b/move/tree/mdk_behind_totem @@ -19,6 +19,11 @@ while [ -n "$1" ]; do shift shift ;; + --user) + USER="$2" + shift + shift + ;; *) ok='' shift @@ -68,8 +73,10 @@ mount_cd() { mdk_move_loop to_cdrom always always_i18n totem nvidia - # tell kicker that it should refetch menu's icons - dcop kicker ksycoca notifyDatabaseChanged '(' ')' + # restore killed kde apps + su -c kded $USER + su -c kicker $USER + su -c kdesktop $USER } while [ -e "/proc/$totem_pid" ]; do 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}; } |