X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=2f1c0af920cf87e4c3678d3414fa48631dbbab73;hb=68a4f67e919c4580ead80729b183506997627fbd;hp=20381ad6dede9b2c03680351c788e3f39738af82;hpb=c587cef8affadec1b4307a58d7b2b5695471d12f;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
old mode 100644
new mode 100755
index 20381ad..2f1c0af
--- a/lxcsu
+++ b/lxcsu
@@ -5,12 +5,15 @@ import setns
 import os
 import sys
 
-from optparse import OptionParser
+from argparse import ArgumentParser
 
 drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'
 
+debug = False
+
 def getarch(f):
     output = os.popen('readelf -h %s 2>&1'%f).readlines()
+    if debug: print "readelf output %s lines"%len(output)
     classlines = [x for x in output if ('Class' in x.split(':')[0])]
     line = classlines[0]
     c = line.split(':')[1]
@@ -26,39 +29,42 @@ def umount(fs_dir):
     return ('device is busy' not in fs_dir)
 
 def main ():
-    parser = OptionParser()
-    parser.add_option("-n", "--nonet",
-                      action="store_true", dest="netns", default=False,
-                      help="Don't enter network namespace")
-    parser.add_option("-m", "--nomnt",
-                      action="store_true", dest="mntns", default=False,
-                      help="Don't enter mount namespace")
-    parser.add_option("-p", "--nopid",
-                      action="store_true", dest="pidns", default=False,
-                      help="Don't enter pid namespace")
-    parser.add_option("-r", "--root",
-                      action="store_true", dest="root", default=False,
-                      help="Enter as root: be careful")
-
-    (options, args) = parser.parse_args()
-
-    try:
-        slice_name = args[0]
-    except IndexError:
-        print "You must specify a vm name"
-        exit(1)
+    parser = ArgumentParser()
+    parser.add_argument("-n", "--nonet",
+                        action="store_true", dest="netns", default=False,
+                        help="Don't enter network namespace")
+    parser.add_argument("-m", "--nomnt",
+                        action="store_true", dest="mntns", default=False,
+                        help="Don't enter mount namespace")
+    parser.add_argument("-p", "--nopid",
+                        action="store_true", dest="pidns", default=False,
+                        help="Don't enter pid namespace")
+    parser.add_argument("-r", "--root",
+                        action="store_true", dest="root", default=False,
+                        help="Enter as root: be careful")
+    parser.add_argument("-d","--debug",
+                        action='store_true', dest='debug', default=False,
+                        help="debug option")
+    parser.add_argument ("slice_name")
+    parser.add_argument ("command_to_run",nargs="*")
+
+    options = parser.parse_args()
+    slice_name=options.slice_name
+    global debug
+    debug=options.debug
 
     try:
         cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name
         output = os.popen(cmd).readlines()
+        if debug: print "output of grep freezer has %s lines"%len(output)
     except:
         print "Error finding slice %s"%slice_name
         exit(1)
 
     slice_spec = None
 
-    # xxx fixme xxx - provide a default as this is not always properly computed
-    arch = 'x86_64'
+    # provide a default as this is not always properly computed
+    arch = None
 
     for e in output:
         try:
@@ -66,22 +72,34 @@ def main ():
             path = l.split(':')[0]  
             comp = l.rsplit(':')[-1]
             slice_name_check = comp.rsplit('/')[-1]
+            if debug: print "dealing with >%s<"%slice_name_check
             
             if (slice_name_check == slice_name):
+                if debug: print "found %s"%slice_name
                 slice_path = path
                 pid = slice_path.split('/')[2]
                 cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
                 if (cmdline == '/sbin/init'):
                     slice_spec = slice_path
                     arch = getarch('/proc/%s/exe'%pid)
+                    if debug: print "setting arch",arch
                     break
-        except:
-            break
+        except Exception,e:
+            if debug: 
+                import traceback
+                print "BEG lxcsu - ignoring exception"
+                traceback.print_exc()
+                print "END lxcsu - ignoring exception"
+            pass
 
     if (not slice_spec or not pid):
         print "Not started: %s"%slice_name
         exit(1)
 
+    if arch is None:
+        arch = 'x86_64'
+        if debug: print "WARNING: setting arch to default x86_64"
+
     # Enter cgroups
     try:
         for subsystem in ['cpuset','memory','blkio']:
@@ -118,10 +136,13 @@ def main ():
         setns.chcontext('/proc/%s/ns/net'%pid)
 
     if (not options.mntns):
-        open('/proc/lxcsu','w').write(pid)
+        setns.chcontext('/proc/%s/ns/mnt'%pid)
 
     if (not options.pidns):
-        open('/proc/pidsu','w').write(pid)
+        setns.chcontext('/proc/%s/ns/pid'%pid)
+
+    if (!os.access('/proc/self'):
+        setns.proc_mount()
 
     # cgroups is not yet LXC-safe, so we need to use the course grained access control
     # strategy of unmounting the filesystem
@@ -143,10 +164,13 @@ def main ():
         cap_arg = '--drop='+drop_capabilities
 
         if (not options.root):
-            exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+args[1:]
+            exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+options.command_to_run
         else:
-            exec_args = [arch,'/usr/sbin/capsh','--','--login']+args[1:]
+            exec_args = [arch,'/usr/sbin/capsh','--','--login']+options.command_to_run
 
+        if debug:
+            print "exec'ing"
+            for arg in exec_args: print ">%s<"%arg
         os.environ['SHELL'] = '/bin/sh'
         os.execv('/usr/bin/setarch',exec_args)
     else: