X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxcsu;h=c076506efb6ba93f27be867f93987496db3eaa11;hb=2e7dc22a9fb1f3cb3a0080126ce47c5e8fef9c47;hp=eceea86e3ce22d83bd59d01f8108f71b33bb13ca;hpb=be0407d0d1687abc781c860fab8432798a30af03;p=lxc-userspace.git

diff --git a/lxcsu b/lxcsu
index eceea86..c076506 100644
--- a/lxcsu
+++ b/lxcsu
@@ -60,10 +60,32 @@ if (not slice_spec or not pid):
     print "Not started: %s"%slice_name
     exit(1)
 
-r1 = setns.chcontext('/proc/%s/ns/utc'%pid)
+# 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)
+
+# 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)
-path = '/proc/%s/ns/net'%pid
-r3 = setns.chcontext(path)
+r3 = setns.chcontext('/proc/%s/ns/net'%pid)
 
 open('/proc/lxcsu','w').write(pid)
 open('/proc/pidsu','w').write(pid)
@@ -73,6 +95,7 @@ pid = os.fork()
 cap_args = map(lambda c:'--drop='+c, drop_capabilities)
     
 if (pid == 0):
-    os.execv('/usr/sbin/capsh',cap_args+['--']+args[1:])
+    os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
+    os.environ['SHELL'] = '/bin/sh'
 else:
     os.waitpid(pid,0)