mirror of
https://github.com/moby/moby.git
synced 2026-06-24 08:48:23 +00:00
Merge pull request #52784 from takumi12311123/49972-check-config-optional-exit
contrib/check-config: don't propagate optional feature failures to exit code
This commit is contained in:
@@ -244,6 +244,10 @@ fi
|
||||
|
||||
echo
|
||||
|
||||
# Save the results of the required features while running optional feature checks.
|
||||
required_features_result=${EXITCODE}
|
||||
EXITCODE=0
|
||||
|
||||
echo 'Optional Features:'
|
||||
{
|
||||
check_flags USER_NS
|
||||
@@ -353,6 +357,9 @@ if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY;
|
||||
fi
|
||||
fi
|
||||
|
||||
# Restore results of the required features check.
|
||||
EXITCODE=${required_features_result}
|
||||
|
||||
echo '- Network Drivers:'
|
||||
echo " - \"$(wrap_color 'bridge' blue)\":"
|
||||
check_sysctl net.ipv4.ip_forward 1 | sed 's/^/ - /'
|
||||
|
||||
Reference in New Issue
Block a user