Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2019-10-25 18:40:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Fri Oct 25 18:40:22 2019 rev:63 rq:741941 version:19.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2019-10-18 14:30:09.020752413 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.2990/cloud-init.changes 2019-10-25 18:40:25.083799821 +0200 @@ -1,0 +2,14 @@ +Tue Oct 22 19:57:22 UTC 2019 - Robert Schweikert <[email protected]> + +- Add cloud-init-renderer-detect.patch (bsc#1154092, boo#1142988) + + Short curcuit the conditional for identifying the sysconfig renderer. + If we find ifup/ifdown accept the renderer as available. + +------------------------------------------------------------------- +Tue Oct 22 12:13:59 UTC 2019 - Robert Schweikert <[email protected]> + +- Add cloud-init-break-resolv-symlink.patch (bsc#1151488) + + If /etc/resolv.conf is a symlink break it. This will avoid netconfig + from clobbering the changes cloud-init applied. + +------------------------------------------------------------------- New: ---- cloud-init-break-resolv-symlink.patch cloud-init-renderer-detect.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.EYmvp6/_old 2019-10-25 18:40:26.115800792 +0200 +++ /var/tmp/diff_new_pack.EYmvp6/_new 2019-10-25 18:40:26.119800796 +0200 @@ -47,6 +47,10 @@ Patch50: cloud-init-noresolv-merge-no-dns-data.diff # FIXME expected in 19.3 Patch51: cloud-init-after-wicked.patch +# FIXME (lp#1849296) +Patch52: cloud-init-break-resolv-symlink.patch +# FIXME (lp#1849378) +Patch53: cloud-init-renderer-detect.patch BuildRequires: fdupes BuildRequires: filesystem @@ -192,6 +196,8 @@ %patch47 %patch50 -p1 %patch51 -p1 +%patch52 +%patch53 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315 ++++++ cloud-init-break-resolv-symlink.patch ++++++ --- 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, ++++++ cloud-init-renderer-detect.patch ++++++ --- cloudinit/net/sysconfig.py.orig +++ cloudinit/net/sysconfig.py @@ -748,7 +748,7 @@ class Renderer(renderer.Renderer): def available(target=None): sysconfig = available_sysconfig(target=target) nm = available_nm(target=target) - return (util.get_linux_distro()[0] in KNOWN_DISTROS + return (util.system_info()['variant'] in KNOWN_DISTROS and any([nm, sysconfig])) @@ -758,6 +758,8 @@ def available_sysconfig(target=None): for p in expected: if not util.which(p, search=search, target=target): return False + else: + return True expected_paths = ['etc/sysconfig/network/scripts/functions.netconfig'] for p in expected_paths:
