From fb85a99f5899df7475ba6b1ac4b2e1d32974eca2 Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Fri, 19 Jun 2015 13:47:48 +0800
Subject: [PATCH] Add some cgroup related config check

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
---
 contrib/check-config.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/check-config.sh b/contrib/check-config.sh
index c43fa2a3ee..9b2ede1372 100755
--- a/contrib/check-config.sh
+++ b/contrib/check-config.sh
@@ -113,7 +113,7 @@ check_device() {
 }
 
 if [ ! -e "$CONFIG" ]; then
-	wrap_warning "warning: $CONFIG does not exist, searching other paths for kernel config..."
+	wrap_warning "warning: $CONFIG does not exist, searching other paths for kernel config ..."
 	for tryConfig in "${possibleConfigs[@]}"; do
 		if [ -e "$tryConfig" ]; then
 			CONFIG="$tryConfig"
@@ -167,7 +167,7 @@ fi
 flags=(
 	NAMESPACES {NET,PID,IPC,UTS}_NS
 	DEVPTS_MULTIPLE_INSTANCES
-	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS
+	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
 	MACVLAN VETH BRIDGE BRIDGE_NETFILTER
 	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
 	NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK}
@@ -181,8 +181,7 @@ echo
 
 echo 'Optional Features:'
 {
-	check_flags MEMCG_SWAP 
-	check_flags MEMCG_SWAP_ENABLED
+	check_flags MEMCG_KMEM MEMCG_SWAP MEMCG_SWAP_ENABLED
 	if  is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then
 		echo "    $(wrap_color '(note that cgroup swap accounting is not enabled in your kernel config, you can enable it by setting boot option "swapaccount=1")' bold black)"
 	fi
@@ -193,10 +192,11 @@ if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]
 fi
 
 flags=(
-	BLK_CGROUP
-	IOSCHED_CFQ
+	BLK_CGROUP IOSCHED_CFQ
 	CGROUP_PERF
-	CFS_BANDWIDTH
+	CGROUP_HUGETLB
+	NET_CLS_CGROUP NETPRIO_CGROUP
+	CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED
 )
 check_flags "${flags[@]}"