X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=742fc8307386fab3fb505fbb8588d76896c42aae;hb=e089948992a8feff3f15719708e21e40b514acf8;hp=baf0e97810722ff27136a36d4c53192b02de7e20;hpb=e54d3fcd42f6e4e6d14b7491f1474dc4777ffe68;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
old mode 100644
new mode 100755
index baf0e97..742fc83
--- a/lxcsu
+++ b/lxcsu
@@ -1,130 +1,27 @@
 #!/usr/bin/python
 
-
-import setns
 import os
 import sys
 
-#from optparse import OptionParser
-
-drop_capabilities='cap_sys_admin,cap_sys_boot,cap_sys_module'
-
-def umount(fs_dir):
-    output = os.popen('/bin/umount %s 2>&1'%fs_dir).read()
-    return ('device is busy' not in fs_dir)
-
-
-"""
-parser = OptionParser()
-parser.add_option("-n", "--net",
-                  action="store_true", dest="netns", default=False,
-                  help="Enter network namespace")
-parser.add_option("-m", "--mnt",
-                  action="store_true", dest="mntns", default=False,
-                  help="Enter mount namespace")
-parser.add_option("-p", "--pid",
-                  action="store_true", dest="pidns", default=False,
-                  help="Enter pid namespace")
-
-(options, args) = parser.parse_args()
-"""
-args = sys.argv[1:]
-
-try:
-	slice_name = args[0]
-except IndexError:
-	print "You must specify a vm name"
-	exit(1)
-
-try:
-	cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name
-	output = os.popen(cmd).readlines()
-except:
-	print "Error finding slice %s"%slice_name
-	exit(1)
-
-slice_spec = None
-for e in output:
-	try:
-		l = e.rstrip()
-		path = l.split(':')[0]	
-		comp = l.rsplit(':')[-1]
-		slice_name_check = comp.rsplit('/')[-1]
-
-		if (slice_name_check == 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
-				break
-	except:
-		break
-
-if (not slice_spec or not pid):
-    print "Not started: %s"%slice_name
-    exit(1)
-
-# Enter cgroups
-try:
-    for subsystem in ['cpuset','memory','blkio']:
-        open('/sys/fs/cgroup/%s/libvirt/lxc/%s/tasks'%(subsystem,slice_name),'w').write(str(os.getpid()))
-
-except:
-    print "Error assigning resources: %s"%slice_name
-    exit(1)
-
-try:
-    open('/sys/fs/cgroup/cpuacct/system/libvirtd.service/libvirt/lxc/%s/tasks'%slice_name,'w').write(str(os.getpid()))
-except:
-    print "Error assigning cpuacct: %s" % slice_name
-    exit(1)
-
-# If the slice is frozen, then we'll get an EBUSY when trying to write to the task
-# list for the freezer cgroup. Since the user couldn't do anything anyway, it's best
-# in this case to error out the shell. (an alternative would be to un-freeze it,
-# add the task, and re-freeze it)
-try:
-    f=open('/sys/fs/cgroup/freezer/libvirt/lxc/%s/tasks'%(slice_name),'w')
-    f.write(str(os.getpid()))
-    # note: we need to call f.close() explicitly, or we'll get an exception in
-    # the object destructor, which will not be caught
-    f.close()
-except:
-    print "Error adding task to freezer cgroup. Slice is probably frozen: %s" % slice_name
-    exit(1)
-
-r1 = setns.chcontext('/proc/%s/ns/uts'%pid)
-r2 = setns.chcontext('/proc/%s/ns/ipc'%pid)
-r3 = setns.chcontext('/proc/%s/ns/net'%pid)
-
-open('/proc/lxcsu','w').write(pid)
-open('/proc/pidsu','w').write(pid)
+from argparse import ArgumentParser
 
-# cgroups is not yet LXC-safe, so we need to use the course grained access control
-# strategy of unmounting the filesystem
+LXCSU_INTERNAL='/usr/sbin/lxcsu-internal'
 
-umount_result = True
-for subsystem in ['cpuset','cpu,cpuacct','memory','devices','freezer','net_cls','blkio','perf_event']:
-    fs_path = '/sys/fs/cgroup/%s'%subsystem
-    if (not umount(fs_path)):
-        print "Error disabling cgroup access"
-        exit(1)
+def main ():
+    parser = ArgumentParser()
+    parser.add_argument ("slice_name")
+    parser.add_argument ("command_to_run",nargs="*")
 
-if (not umount('/sys/fs/cgroup')):
-    print "Error disabling cgroup access"
-    exit(1)
+    options = parser.parse_args()
+    slice_name=options.slice_name
+    commands = options.command_to_run
+    if (not commands):
+        commands = ['/bin/sh']
 
-pid = os.fork()
 
-if (pid == 0):
-    cap_arg = '--drop='+drop_capabilities
-    exec_args = ['/usr/sbin/capsh',cap_arg,'--','--login']+args[1:]
+    exec_args = [LXCSU_INTERNAL,slice_name,'--','-c']
+    exec_args+=commands
+    os.execv(LXCSU_INTERNAL,exec_args)
 
-    os.environ['SHELL'] = '/bin/sh'
-    os.execv('/usr/sbin/capsh',exec_args)
-else:
-    (r_pid,combined)=os.waitpid(pid,0)
-    retcod=combined/256
-    sys.exit(retcod)
-    
+if __name__ == '__main__':
+    main()