Browse code

Do not warn in check-config script about ext3 if provided by ext4

Many distributions now use ext4 to provide ext2 and ext3 support,
so do not warn about possibly missing ext3 support if the config
option is used.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

Justin Cormack authored on 2016/10/28 19:16:04
Showing 1 changed files
... ...
@@ -238,14 +238,20 @@ flags=(
238 238
 )
239 239
 check_flags "${flags[@]}"
240 240
 
241
-check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
242
-if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
243
-	echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
241
+if ! is_set EXT4_USE_FOR_EXT2; then
242
+	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
243
+	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
244
+		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
245
+	fi
244 246
 fi
245 247
 
246 248
 check_flags EXT4_FS EXT4_FS_POSIX_ACL EXT4_FS_SECURITY
247 249
 if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
248
-	echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
250
+	if is_set EXT4_USE_FOR_EXT2; then
251
+		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
252
+	else
253
+		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
254
+	fi
249 255
 fi
250 256
 
251 257
 echo '- Network Drivers:'