Zefan Li 46e26ed16e Fix sysinfo regression ...

The cleanup to sysinfo package introduced a regression.

If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.

Signed-off-by: Zefan Li <lizefan@huawei.com>
Upstream-commit: 439869320177f56a559ef189f5ce29f24cf99e12
Component: engine

2015-06-19 09:44:23 +08:00

..

engine

Fix sysinfo regression

2015-06-19 09:44:23 +08:00