diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2003-11-18 14:36:35 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2003-11-18 14:36:35 +0000 |
commit | 4945f073b797f4ebc9a8207054b80b336649575b (patch) | |
tree | 69eb855043d61c62fcc1f4cb5369edd22180e262 | |
parent | 38f31491ccae280f6818fd53e26b4fd98444b538 (diff) | |
download | drakx-4945f073b797f4ebc9a8207054b80b336649575b.tar drakx-4945f073b797f4ebc9a8207054b80b336649575b.tar.gz drakx-4945f073b797f4ebc9a8207054b80b336649575b.tar.bz2 drakx-4945f073b797f4ebc9a8207054b80b336649575b.tar.xz drakx-4945f073b797f4ebc9a8207054b80b336649575b.zip |
- also work in nfs with no live_tree.clp mounted
- kio_uiserver will get killed without mentioning
-rwxr-xr-x | move/tree/mdk_totem | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/move/tree/mdk_totem b/move/tree/mdk_totem index 5224e154f..72c0f9e6f 100755 --- a/move/tree/mdk_totem +++ b/move/tree/mdk_totem @@ -15,7 +15,7 @@ sub busy_pids_and_files() { my @l2 = grep { $_ } map { (split)[5] } cat_("/proc/$_/maps"); - if (my @l = grep { m!^/image(_boot)?/! } @l1, @l2) { + if (my @l = grep { m!^/(image(_boot)?|cdrom/live_tree)/! } @l1, @l2) { my ($cmdline) = cat_("/proc/$_/cmdline") =~ /([^\0]*)/; my $exe = readlink("/proc/$_/exe"); { pid => $_, cmdline => $cmdline, exe => $exe, files => [ sort(uniq(@l)) ] }; @@ -27,7 +27,7 @@ sub busy_pids_and_files() { sub remove_simple_daemons { my (@busy) = @_; - my @auto_killed = grep { $_->{cmdline} =~ m!\bkdesud$|^kdeinit: kded$! } @busy or return @busy; + my @auto_killed = grep { $_->{cmdline} =~ m!\b(kdesud|kded|kio_uiserver)$! } @busy or return @busy; kill 15, map { $_->{pid} } @auto_killed; sleep 1; |