소스 검색

Merge pull request #24301 from coolljt0725/add_dummy_to_check_config

Add IPVLAN and DUMMY to check-config.sh
Sebastiaan van Stijn 9 년 전
부모
커밋
5d11a7987b
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5 1
      contrib/check-config.sh

+ 5 - 1
contrib/check-config.sh

@@ -183,7 +183,7 @@ flags=(
 	DEVPTS_MULTIPLE_INSTANCES
 	DEVPTS_MULTIPLE_INSTANCES
 	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
 	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
 	KEYS
 	KEYS
-	MACVLAN VETH BRIDGE BRIDGE_NETFILTER
+	VETH BRIDGE BRIDGE_NETFILTER
 	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
 	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
 	NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK}
 	NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK}
 	NF_NAT NF_NAT_NEEDED
 	NF_NAT NF_NAT_NEEDED
@@ -252,6 +252,10 @@ echo '- Network Drivers:'
 	check_flags VXLAN | sed 's/^/  /'
 	check_flags VXLAN | sed 's/^/  /'
 	echo '  Optional (for secure networks):'
 	echo '  Optional (for secure networks):'
 	check_flags XFRM_ALGO XFRM_USER | sed 's/^/  /'
 	check_flags XFRM_ALGO XFRM_USER | sed 's/^/  /'
+	echo '- "'$(wrap_color 'ipvlan' blue)'":'
+	check_flags IPVLAN | sed 's/^/  /'
+	echo '- "'$(wrap_color 'macvlan' blue)'":'
+	check_flags MACVLAN DUMMY | sed 's/^/  /'
 } | sed 's/^/  /'
 } | sed 's/^/  /'
 
 
 echo '- Storage Drivers:'
 echo '- Storage Drivers:'