From b0c63d0e779ac7aa6cb31230452b74bc1c6b882e17313972e778f80cf551a391 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Sat, 17 Oct 2020 10:31:14 +0000 Subject: [PATCH] - Update cloud-init-write-routes.patch (bsc#1177526) + Avoid exception if no gateway information is present and warning is triggered for existing routing. OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=174 --- cloud-init-write-routes.patch | 7 +++++-- cloud-init.changes | 7 +++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cloud-init-write-routes.patch b/cloud-init-write-routes.patch index 9f39173..2e99247 100644 --- a/cloud-init-write-routes.patch +++ b/cloud-init-write-routes.patch @@ -10,7 +10,7 @@ Index: cloudinit/distros/opensuse.py from cloudinit import helpers from cloudinit import log as logging -@@ -174,7 +175,137 @@ class Distro(distros.Distro): +@@ -174,7 +175,140 @@ class Distro(distros.Distro): util.write_file(out_fn, str(conf), 0o644) def _write_network_config(self, netconfig): @@ -59,9 +59,12 @@ Index: cloudinit/distros/opensuse.py + ) + continue + if dest == 'default' and has_default_route: ++ dest_info = dest ++ if gateway: ++ dest_info = ' '.join([dest, gateway, '-', '-']) + LOG.warning( + '%s already has default route, skipping "%s"', -+ if_name, ' '.join([dest, gateway, '-', '-']) ++ if_name, dest_info + ) + continue + if dest == 'default' and not has_default_route: diff --git a/cloud-init.changes b/cloud-init.changes index b4782ee..074c3ea 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Oct 17 10:25:30 UTC 2020 - Robert Schweikert + +- Update cloud-init-write-routes.patch (bsc#1177526) + + Avoid exception if no gateway information is present and warning + is triggered for existing routing. + ------------------------------------------------------------------- Fri Jul 24 19:55:40 UTC 2020 - Robert Schweikert