Unmount any bind mount that is hiding /etc/resolv.conf
authorTom Hughes <tom@compton.nu>
Tue, 11 Feb 2020 11:13:23 +0000 (11:13 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 11 Feb 2020 11:13:23 +0000 (11:13 +0000)
This avoids problems when running under kitchen-dokken which
has a bind mount over the top.

cookbooks/networking/recipes/default.rb

index cfc04cbef93868de5561c40eb9f1e9038ae1eb0b..6031ef508f6ed1a842bebe0e9782580bfe742493 100644 (file)
@@ -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