mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Update check_config for MEMCG_KMEM
CONFIG_MEMCG_KMEM is removed since 4.6, it's accounted by default since 4.6, so it's merged to CONFIG_MEMCG. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
		
							parent
							
								
									6e12d0720f
								
							
						
					
					
						commit
						27d7b135d4
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -206,12 +206,16 @@ echo 'Optional Features:'
 | 
			
		|||
	check_flags CGROUP_PIDS
 | 
			
		||||
}
 | 
			
		||||
{
 | 
			
		||||
	check_flags MEMCG_KMEM MEMCG_SWAP MEMCG_SWAP_ENABLED
 | 
			
		||||
	check_flags 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
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then
 | 
			
		||||
	check_flags MEMCG_KMEM
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then
 | 
			
		||||
	check_flags RESOURCE_COUNTERS
 | 
			
		||||
fi
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue