← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~rjschwei/cloud-init:breakLink into cloud-init:master

 

One inline question, probably for my own edification.  Thanks!

Diff comments:

> diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
> index e381596..44a2f11 100644
> --- a/cloudinit/net/sysconfig.py
> +++ b/cloudinit/net/sysconfig.py
> @@ -708,6 +708,12 @@ class Renderer(renderer.Renderer):
>              resolv_content = self._render_dns(network_state,
>                                                existing_dns_path=dns_path)
>              if resolv_content:
> +                # netconfig checks if the resolv file is a link and if that

Forgive my ignorance about the stack here, Robert, but is there anything we can do to configure DNS in netconfig itself so that even if it does assume control it won't break the configuration we want?

> +                # is true it assumes it is in controil of the file and
> +                # will clobber our changes, break the link to ensure the user
> +                # configuration sticks
> +                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,


-- 
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/374517
Your team cloud-init Commiters is requested to review the proposed merge of ~rjschwei/cloud-init:breakLink into cloud-init:master.


References