X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu-internal;h=638fbdf8f95d7c5894a23e9c0492a051f8d0f603;hb=2741216c74ca71737c1c90a242eeed36cc9ee1cd;hp=83a0d101ff2443d6b0decd19d8bf9ed51ef60c74;hpb=605fadcc345e70d250b6c4b2cd3116b34c39a323;p=lxc-userspace.git

diff --git a/lxcsu-internal b/lxcsu-internal
index 83a0d10..638fbdf 100755
--- a/lxcsu-internal
+++ b/lxcsu-internal
@@ -13,7 +13,6 @@ 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,7 +25,7 @@ def getarch(f):
 
 def umount(fs_dir):
     output = os.popen('/bin/umount %s 2>&1'%fs_dir).read()
-    return ('device is busy' not in fs_dir)
+    return ('device is busy' not in output)
 
 def main ():
     parser = ArgumentParser()
@@ -48,15 +47,17 @@ def main ():
     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
+    args = parser.parse_args()
+    slice_name=args.slice_name
+    # support for either setting debug at the top of this file, or on the command-line
+    if args.debug:
+        global debug
+        debug=True
 
     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)
+#        if debug: print "output of grep freezer has %s lines"%len(output)
     except:
         print "Error finding slice %s"%slice_name
         exit(1)
@@ -79,10 +80,9 @@ def main ():
                 slice_path = path
                 pid = slice_path.split('/')[2]
                 cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00')
-                if (cmdline == '/sbin/init'):
+                if (cmdline == '/sbin/init') or (cmdline.startswith("init [")):
                     slice_spec = slice_path
                     arch = getarch('/proc/%s/exe'%pid)
-                    if debug: print "setting arch",arch
                     break
         except Exception,e:
             if debug: 
@@ -98,7 +98,6 @@ def main ():
 
     if arch is None:
         arch = 'x86_64'
-        if debug: print "WARNING: setting arch to default x86_64"
 
     # Set sysctls specific to slice
     sysctl_dir = '/etc/planetlab/vsys-attributes/%s'%slice_name
@@ -143,19 +142,25 @@ def main ():
 
     setns.chcontext('/proc/%s/ns/uts'%pid)
     setns.chcontext('/proc/%s/ns/ipc'%pid)
+    
+    if (not args.pidns):
+        setns.chcontext('/proc/%s/ns/pid'%pid)
 
-    if (not options.netns):
+    if (not args.netns):
         setns.chcontext('/proc/%s/ns/net'%pid)
 
-    if (not options.mntns):
+    if (not args.mntns):
         setns.chcontext('/proc/%s/ns/mnt'%pid)
 
-    if (not options.pidns):
-        setns.chcontext('/proc/%s/ns/pid'%pid)
+    
 
+    proc_mounted = False
     if (not os.access('/proc/self',0)):
+        proc_mounted = True
         setns.proc_mount()
 
+    
+
     # cgroups is not yet LXC-safe, so we need to use the course grained access control
     # strategy of unmounting the filesystem
 
@@ -175,17 +180,18 @@ def main ():
     if (pid == 0):
         cap_arg = '--drop='+drop_capabilities
 
-        if (not options.root):
-            exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--','--login']+options.command_to_run
+        if (not args.root):
+            exec_args = [arch,'/usr/sbin/capsh',cap_arg,'--user=%s'%slice_name,'--','--login',]+args.command_to_run
         else:
-            exec_args = [arch,'/usr/sbin/capsh','--','--login']+options.command_to_run
+            exec_args = [arch,'/usr/sbin/capsh','--','--login']+args.command_to_run
 
-        if debug:
-            print "exec'ing"
-            for arg in exec_args: print ">%s<"%arg
         os.environ['SHELL'] = '/bin/sh'
+        os.environ['HOME'] = '/home/%s'%slice_name
+        os.environ['LD_PRELOAD'] = '/etc/planetlab/lib/bind_public.so'
+        if debug: print 'lxcsu-internal:execv:','/usr/bin/setarch',exec_args
         os.execv('/usr/bin/setarch',exec_args)
     else:
+        setns.proc_umount()
         _,status = os.waitpid(pid,0)
         exit(os.WEXITSTATUS(status))