X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=f08182632d657c3b2493a66f0b77b21d9eaa0b1e;hb=cbe129e67722d4c042fd48d045ef43d8796381e8;hp=a53c1589212ce365c3c958bff8ae8c3b979a078b;hpb=b53ba3b3df3023322dc02d2a4e36298a8a3a2890;p=nodemanager.git

diff --git a/tools.py b/tools.py
index a53c158..f081826 100644
--- a/tools.py
+++ b/tools.py
@@ -9,6 +9,7 @@ import threading
 import subprocess
 import shutil
 import sys
+import signal
 
 import logger
 
@@ -309,15 +310,31 @@ def get_node_virt ():
         f.write(virt)
     return virt
 
+# how to run a command in a slice
+# now this is a painful matter
+# the problem is with capsh that forces a bash command to be injected in its exec'ed command
+# so because lxcsu uses capsh, you cannot exec anything else than bash
+# bottom line is, what actually needs to be called is
+# vs:  vserver exec slicename command and its arguments
+# lxc: lxcsu slicename "command and its arguments"
+# which, OK, is no big deal as long as the command is simple enough, 
+# but do not stretch it with arguments that have spaces or need quoting as that will become a nightmare
 def command_in_slice (slicename, argv):
-    # with vserver this can be done using vserver .. exec <trigger-script>
-    # with lxc this is less clear as we are still discussing how lxcsu should behave
-    # ideally we'd need to run lxcsu .. <trigger-script>
     virt=get_node_virt()
     if virt=='vs':
         return [ 'vserver', slicename, 'exec', ] + argv
     elif virt=='lxc':
-        return [ 'lxcsu', slicename, ] + argv
+        # wrap up argv in a single string for -c
+        return [ 'lxcsu', slicename, ] + [ " ".join(argv) ]
     logger.log("command_in_slice: WARNING: could not find a valid virt")
     return argv
 
+####################
+def init_signals ():
+    def handler (signum, frame):
+        logger.log("Received signal %d - exiting"%signum)
+        exit(1)
+    signal.signal(signal.SIGHUP,handler)
+    signal.signal(signal.SIGQUIT,handler)
+    signal.signal(signal.SIGINT,handler)
+    signal.signal(signal.SIGTERM,handler)