From 461385522c8df6d517bb0dd96ce56b710597b86c Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Mon, 10 Aug 2026 04:39:28 +0200 Subject: [PATCH] Accept lastchance in every network manager The retry pass calls apply_configuration with lastchance=True, which only NetworkManager accepts. It is unreachable today, since only NetworkManager returns the 1 that fills the retry list, but it springs the moment either of the others grows a return, or the retry selection is brought in line with the first pass. Matching the signatures costs nothing. --- confluent_osdeploy/common/profile/scripts/confignet | 4 ++-- confluent_osdeploy/debian/profiles/default/scripts/confignet | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/confluent_osdeploy/common/profile/scripts/confignet b/confluent_osdeploy/common/profile/scripts/confignet index 9a972d55..0438f87f 100644 --- a/confluent_osdeploy/common/profile/scripts/confignet +++ b/confluent_osdeploy/common/profile/scripts/confignet @@ -159,7 +159,7 @@ class NetplanManager(object): currinfo[devname]['routes'] = routeinfo currcfg[devname] = currinfo[devname] - def apply_configuration(self, cfg): + def apply_configuration(self, cfg, lastchance=False): devnames = cfg['interfaces'] if len(devnames) > 1: teammode = cfg['settings'].get('team_mode', None) @@ -342,7 +342,7 @@ class WickedManager(object): v = v.strip() currcfg[k] = v - def apply_configuration(self, cfg): + def apply_configuration(self, cfg, lastchance=False): stgs = cfg['settings'] ipcfg = 'STARTMODE=auto\n' routecfg = '' diff --git a/confluent_osdeploy/debian/profiles/default/scripts/confignet b/confluent_osdeploy/debian/profiles/default/scripts/confignet index 61d8d4ff..25591b08 100644 --- a/confluent_osdeploy/debian/profiles/default/scripts/confignet +++ b/confluent_osdeploy/debian/profiles/default/scripts/confignet @@ -151,7 +151,7 @@ class NetplanManager(object): nicinfo[devname]['routes'] = routeinfo self.cfgbydev[devname] = nicinfo[devname] - def apply_configuration(self, cfg): + def apply_configuration(self, cfg, lastchance=False): devnames = cfg['interfaces'] if len(devnames) != 1: raise Exception('Multi-nic team/bonds not yet supported') @@ -266,7 +266,7 @@ class WickedManager(object): v = v.strip() currcfg[k] = v - def apply_configuration(self, cfg): + def apply_configuration(self, cfg, lastchance=False): stgs = cfg['settings'] ipcfg = 'STARTMODE=auto\n' routecfg = ''