Unmount any bind mount that is hiding /etc/resolv.conf

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index afdbd7163b3444f68bd69ff263e37c20b58ffb84..6031ef508f6ed1a842bebe0e9782580bfe742493 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -23,6 +23,8 @@
 require "ipaddr"
 require "yaml"
 
+package "netplan.io"
+
 netplan = {
   "network" => {
     "version" => 2,
@@ -210,7 +212,18 @@ template "/etc/systemd/resolved.conf.d/99-chef.conf" do
   owner "root"
   group "root"
   mode 0o644
-  notifies :restart, "service[systemd-resolved]"
+  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
 
 if node[:networking][:tcp_fastopen_key]