From 3527d4504b9b4f95223f61766c5f69ff2e419077 Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Fri, 19 Jun 2015 13:45:07 +0800
Subject: [PATCH 1/2] Add check config for ext3 file system

Some distros still use ext3 as default file system, we should check
these configs as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0c4c8302898d51d43c83ea3bb6a0ccbf0723457c
Component: engine
---
 components/engine/contrib/check-config.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/components/engine/contrib/check-config.sh b/components/engine/contrib/check-config.sh
index c9932f6d4b..c43fa2a3ee 100755
--- a/components/engine/contrib/check-config.sh
+++ b/components/engine/contrib/check-config.sh
@@ -200,6 +200,16 @@ flags=(
 )
 check_flags "${flags[@]}"
 
+check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
+if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+	echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
+fi
+
+check_flags EXT4_FS EXT4_FS_POSIX_ACL EXT4_FS_SECURITY
+if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
+	echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
+fi
+
 echo '- Storage Drivers:'
 {
 	echo '- "'$(wrap_color 'aufs' blue)'":'
@@ -207,16 +217,15 @@ echo '- Storage Drivers:'
 	if ! is_set AUFS_FS && grep -q aufs /proc/filesystems; then
 		echo "    $(wrap_color '(note that some kernels include AUFS patches but not the AUFS_FS flag)' bold black)"
 	fi
-	check_flags EXT4_FS_POSIX_ACL EXT4_FS_SECURITY | sed 's/^/  /'
 
 	echo '- "'$(wrap_color 'btrfs' blue)'":'
 	check_flags BTRFS_FS | sed 's/^/  /'
 
 	echo '- "'$(wrap_color 'devicemapper' blue)'":'
-	check_flags BLK_DEV_DM DM_THIN_PROVISIONING EXT4_FS EXT4_FS_POSIX_ACL EXT4_FS_SECURITY | sed 's/^/  /'
+	check_flags BLK_DEV_DM DM_THIN_PROVISIONING | sed 's/^/  /'
 
 	echo '- "'$(wrap_color 'overlay' blue)'":'
-	check_flags OVERLAY_FS EXT4_FS_SECURITY EXT4_FS_POSIX_ACL | sed 's/^/  /'
+	check_flags OVERLAY_FS | sed 's/^/  /'
 
 	echo '- "'$(wrap_color 'zfs' blue)'":'
 	echo "  - $(check_device /dev/zfs)"

From 40a12bcca9d6398f14aee04ee173cb5e5367f1be 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 2/2] Add some cgroup related config check

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

diff --git a/components/engine/contrib/check-config.sh b/components/engine/contrib/check-config.sh
index c43fa2a3ee..9b2ede1372 100755
--- a/components/engine/contrib/check-config.sh
+++ b/components/engine/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[@]}"