forked from pool/cloud-init
Robert Schweikert
e61b62e5b9
+ If /etc/resolv.conf is a symlink break it. This will avoid netconfig
from clobbering the changes cloud-init applied.
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=150
15 lines
732 B
Diff
15 lines
732 B
Diff
--- cloudinit/net/sysconfig.py.orig
|
|
+++ cloudinit/net/sysconfig.py
|
|
@@ -705,6 +705,11 @@ class Renderer(renderer.Renderer):
|
|
resolv_content = self._render_dns(network_state,
|
|
existing_dns_path=dns_path)
|
|
if resolv_content:
|
|
+ # netconfig checks if /etc/resolv.conf is a symlink and if
|
|
+ # that is true will write it's version of the file clobbering
|
|
+ # our changes.
|
|
+ if os.path.islink(dns_path):
|
|
+ os.unlink(dns_path)
|
|
util.write_file(dns_path, resolv_content, file_mode)
|
|
if self.networkmanager_conf_path:
|
|
nm_conf_path = util.target_path(target,
|