Merge pull request opencontainers#118 from hqhq/hq_fix_memory_cgroup

Fix error when memory cgroup not mounted
jhjeong-kr · Jul 13, 2015 · 31f23e4 · 31f23e4
2 parents 0d12ac2 + 4e24410
commit 31f23e4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
@@ -19,7 +19,10 @@ type MemoryGroup struct {
 
 func (s *MemoryGroup) Apply(d *data) error {
 	path, err := d.path("memory")
-	if err != nil && !cgroups.IsNotFound(err) {
+	if err != nil {
+		if cgroups.IsNotFound(err) {
+			return nil
+		}
 		return err
 	}
 	if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {