Skip to content
Snippets Groups Projects
Commit 433ca2ec authored by Piyush Srivastava's avatar Piyush Srivastava
Browse files

Fix issue with mountCgroups not recognizing mounted cgroup

Changed mountCgroups to use the file /proc/mounts (instead of the
current case where it uses the less reliable
(http://www.mail-archive.com/lxc-devel@lists.sourceforge.net/msg00455.html)
/etc/mtab thorugh the mount program
parent c188bee3
No related branches found
No related tags found
No related merge requests found
...@@ -363,13 +363,13 @@ def fixLimits(): ...@@ -363,13 +363,13 @@ def fixLimits():
def mountCgroups(): def mountCgroups():
"Make sure cgroups file system is mounted" "Make sure cgroups file system is mounted"
mounts = quietRun( 'mount' ) mounts = quietRun( 'cat /proc/mounts' )
cgdir = '/sys/fs/cgroup' cgdir = '/sys/fs/cgroup'
csdir = cgdir + '/cpuset' csdir = cgdir + '/cpuset'
if ('cgroup on %s' % cgdir not in mounts and if ('cgroup %s' % cgdir not in mounts and
'cgroups on %s' % cgdir not in mounts): 'cgroups %s' % cgdir not in mounts):
raise Exception( "cgroups not mounted on " + cgdir ) raise Exception( "cgroups not mounted on " + cgdir )
if 'cpuset on %s' % csdir not in mounts: if 'cpuset %s' % csdir not in mounts:
errRun( 'mkdir -p ' + csdir ) errRun( 'mkdir -p ' + csdir )
errRun( 'mount -t cgroup -ocpuset cpuset ' + csdir ) errRun( 'mount -t cgroup -ocpuset cpuset ' + csdir )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment