From 1a5e1536826b860f179c7a2ebc143565970622e7 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 11 Feb 2020 11:13:23 +0000 Subject: [PATCH] Unmount any bind mount that is hiding /etc/resolv.conf This avoids problems when running under kitchen-dokken which has a bind mount over the top. --- cookbooks/networking/recipes/default.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index cfc04cbef..6031ef508 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -215,6 +215,13 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do notifies :restart, "service[systemd-resolved]", :immediately end +if node[:filesystem][:by_mountpoint]["/etc/resolv.conf"] + mount "/etc/resolv.conf" do + action :umount + device node[:filesystem][:by_mountpoint]["/etc/resolv.conf"][:devices].first + end +end + link "/etc/resolv.conf" do to "../run/systemd/resolve/stub-resolv.conf" end -- 2.43.2