Hello community, here is the log from the commit of package cloud-init for openSUSE:Factory checked in at 2019-11-10 22:36:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cloud-init (Old) and /work/SRC/openSUSE:Factory/.cloud-init.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cloud-init" Sun Nov 10 22:36:38 2019 rev:64 rq:746646 version:19.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cloud-init/cloud-init.changes 2019-10-25 18:40:25.083799821 +0200 +++ /work/SRC/openSUSE:Factory/.cloud-init.new.2990/cloud-init.changes 2019-11-10 22:36:39.585029990 +0100 @@ -1,0 +2,7 @@ +Wed Nov 6 14:43:54 UTC 2019 - Petr Pavlu <[email protected]> + +- Update cloud-init-write-routes.patch (bsc#1155376) + + Write a route's destination network in CIDR notation instead of using the + netmask. This provides support for correctly recording IPv6 routes. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cloud-init.spec ++++++ --- /var/tmp/diff_new_pack.1vu1fL/_old 2019-11-10 22:36:40.261030868 +0100 +++ /var/tmp/diff_new_pack.1vu1fL/_new 2019-11-10 22:36:40.261030868 +0100 @@ -49,7 +49,7 @@ Patch51: cloud-init-after-wicked.patch # FIXME (lp#1849296) Patch52: cloud-init-break-resolv-symlink.patch -# FIXME (lp#1849378) +# FIXME (lp#1849378) expected in 19.3 Patch53: cloud-init-renderer-detect.patch BuildRequires: fdupes ++++++ cloud-init-write-routes.patch ++++++ --- /var/tmp/diff_new_pack.1vu1fL/_old 2019-11-10 22:36:40.317030940 +0100 +++ /var/tmp/diff_new_pack.1vu1fL/_new 2019-11-10 22:36:40.317030940 +0100 @@ -1,6 +1,14 @@ --- cloudinit/distros/opensuse.py.orig +++ cloudinit/distros/opensuse.py -@@ -172,7 +172,48 @@ class Distro(distros.Distro): +@@ -11,6 +11,7 @@ + from cloudinit import distros + + from cloudinit.distros.parsers.hostname import HostnameConf ++from cloudinit.net.network_state import mask_to_net_prefix + + from cloudinit import helpers + from cloudinit import log as logging +@@ -172,7 +173,47 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): @@ -29,20 +37,19 @@ + dest = route.get('network') + if dest in default_nets: + dest = 'default' -+ gateway = route.get('gateway') -+ config_routes += ' '.join([dest, gateway]) + if dest != 'default': -+ config_routes += ' ' + route.get('netmask', '') -+ else: -+ config_routes += ' -' -+ config_routes += ' -' -+ config_routes += '\n' ++ prefix = mask_to_net_prefix(route.get('netmask')) ++ dest += '/' + str(prefix) ++ gateway = route.get('gateway') ++ config_routes += ' '.join( ++ [dest, gateway, '-', '-\n'] ++ ) + if not config_routes: + dest = 'default' + gateway = subnet.get('gateway') + if gateway: + config_routes += ' '.join( -+ [dest, gateway, '-', '-', '\n'] ++ [dest, gateway, '-', '-\n'] + ) + if config_routes: + route_file = '/etc/sysconfig/network/ifroute-%s' % if_name
