diff --git a/cloud-init-write-routes.patch b/cloud-init-write-routes.patch index 59443dc..43f3760 100644 --- a/cloud-init-write-routes.patch +++ b/cloud-init-write-routes.patch @@ -1,12 +1,15 @@ --- cloudinit/distros/opensuse.py.orig +++ cloudinit/distros/opensuse.py -@@ -172,8 +172,40 @@ class Distro(distros.Distro): +@@ -172,7 +172,41 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): +- return self._supported_write_network_config(netconfig) ++ net_apply_res = self._supported_write_network_config(netconfig) ++ # Clobber the route files that were written in RH key-value style + self._write_routes(netconfig) - return self._supported_write_network_config(netconfig) - ++ return net_apply_res ++ + def _write_routes(self, netconfig): + """Write route files, not part of the standard distro interface""" + # Due to the implementation of the sysconfig renderer default routes @@ -37,7 +40,6 @@ + if config_routes: + route_file = '/etc/sysconfig/network/ifroute-%s' % if_name + util.write_file(route_file, config_routes) -+ + @property def preferred_ntp_clients(self): - """The preferred ntp client is dependent on the version.""" diff --git a/cloud-init.changes b/cloud-init.changes index 9e8cd68..29ea4ee 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Feb 22 16:20:28 UTC 2019 - Robert Schweikert + +- Modify cloud-init-write-routes.patch (bsc#1125992) + + Fix the order of calls, the SUSE imaplementation of route config file + writing must clobber the default implementation. + ------------------------------------------------------------------- Fri Feb 22 00:42:14 UTC 2019 - Robert Schweikert