summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <john.mccrae@progress.com>2022-10-20 04:16:00 +0000
committerGitHub <noreply@github.com>2022-10-20 04:16:00 +0000
commit5e91b90cb55903d25ea9dce0dd3a7d4311922ad9 (patch)
tree6be4a0389d5b92b5739b96da26cf60661f77c285
parentde9e5cd061176d874854da715a7ac5fcf26d9ba8 (diff)
parent0c267d89d8d18827a3378e70b6f36129710f4b51 (diff)
downloadchef-5e91b90cb55903d25ea9dce0dd3a7d4311922ad9.tar.gz
Merge pull request #13257 from chef/jfm/chef17_resolver_conf3
confirmed the fix.. merging!
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/linux.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
index 71a9cc9ea8..9f452c00dc 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/linux.rb
@@ -43,6 +43,7 @@ include_recipe "ntp" unless fedora? # fedora 34+ doesn't have NTP
resolver_config "/etc/resolv.conf" do
nameservers [ "8.8.8.8", "8.8.4.4" ]
search [ "chef.io" ]
+ atomic_update false # otherwise EBUSY for linux docker containers
end
users_from_databag = search("users", "*:*")