From: Claudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Date: Wed, 17 Aug 2011 12:51:29 +0000 (+0200)
Subject: Better cleanup - really really kill stuff
X-Git-Tag: nepi-3.0.0~302
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0467eaeec30de03b17232a4adfb28606360f26b3;p=nepi.git

Better cleanup - really really kill stuff
---

diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py
index b6641b7d..a890271a 100644
--- a/src/nepi/testbeds/planetlab/node.py
+++ b/src/nepi/testbeds/planetlab/node.py
@@ -467,12 +467,13 @@ class Node(object):
 
         (out,err),proc = server.popen_ssh_command(
             # Some apps need two kills
-            "sudo -S killall -u %(slicename)s ; "
-            "sudo -S killall -u %(slicename)s ; "
-            "sudo -S killall python tcpdump ; "
-            "sudo -S kill $(ps -N T -o pid --no-heading | sort) ; "
-            "sudo -S killall -u root ; "
-            "sudo -S killall -u root " % {
+            "sudo -S killall python tcpdump || /bin/true ; "
+            "sudo -S killall python tcpdump || /bin/true ; "
+            "sudo -S kill $(ps -N T -o pid --no-heading | sort) || /bin/true ; "
+            "sudo -S killall -u %(slicename)s || /bin/true ; "
+            "sudo -S killall -u %(slicename)s || /bin/true ; "
+            "sudo -S killall -u root || /bin/true ; "
+            "sudo -S killall -u root || /bin/true " % {
                 'slicename' : self.slicename ,
             },
             host = self.hostname,