forked from pool/cloud-init
Robert Schweikert
3aeb460fd5
+ Remove patches included upstream:
- cloud-init-azure-def-usr-pass.patch
- cloud-init-after-kvp.diff
- cloud-init-recognize-hpc.patch
- use_arroba_to_include_sudoers_directory-bsc_1181283.patch
- cloud-init-bonding-opts.patch
- cloud-init-log-file-mode.patch
- cloud-init-no-pwd-in-log.patch
- 0001-templater-drop-Jinja-Python-2-compatibility-shim.patch
+ Remove cloud-init-sle12-compat.patch, version in SLE 12 is frozen to 20.2
+ Remove cloud-init-tests-set-exec.patch no longer needed
+ Forward port:
- cloud-init-write-routes.patch
- cloud-init-break-resolv-symlink.patch
- cloud-init-sysconf-path.patch
- cloud-init-no-tempnet-oci.patch
+ Add \r\n check for SSH keys in Azure (#889)
+ Revert "Add support to resize rootfs if using LVM (#721)" (#887)
(LP: #1922742)
+ Add Vultaire as contributor (#881) [Paul Goins]
+ Azure: adding support for consuming userdata from IMDS (#884) [Anh Vo]
+ test_upgrade: modify test_upgrade_package to run for more sources (#883)
+ Fix chef module run failure when chef_license is set (#868) [Ben Hughes]
+ Azure: Retry net metadata during nic attach for non-timeout errs (#878)
[aswinrajamannar]
+ Azure: Retrieve username and hostname from IMDS (#865) [Thomas Stringer]
+ Azure: eject the provisioning iso before reporting ready (#861) [Anh Vo]
+ Use `partprobe` to re-read partition table if available (#856)
[Nicolas Bock] (LP: #1920939)
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=189
15 lines
732 B
Diff
15 lines
732 B
Diff
--- cloudinit/net/sysconfig.py.orig
|
|
+++ cloudinit/net/sysconfig.py
|
|
@@ -918,6 +918,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 = subp.target_path(target,
|