From 010c1388b53c8380ab0b8b9bace6a8e8dbcb6dcd Mon Sep 17 00:00:00 2001 From: Chris Aumann Date: Mon, 27 Nov 2023 17:23:41 +0100 Subject: [PATCH 1/2] networkd: fix formatting --- src/networkd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/networkd.c b/src/networkd.c index ee76eae56..74374d9b1 100644 --- a/src/networkd.c +++ b/src/networkd.c @@ -353,7 +353,7 @@ write_bond_parameters(const NetplanNetDefinition* def, GString* s) if (def->bond_params.selection_logic) g_string_append_printf(params, "\nAdSelect=%s", def->bond_params.selection_logic); if (def->bond_params.all_members_active) - g_string_append_printf(params, "\nAllSlavesActive=%d", def->bond_params.all_members_active); /* wokeignore:rule=slave */ + g_string_append_printf(params, "\nAllSlavesActive=%d", def->bond_params.all_members_active); /* wokeignore:rule=slave */ if (def->bond_params.arp_interval) { g_string_append(params, "\nARPIntervalSec="); if (interval_has_suffix(def->bond_params.arp_interval)) @@ -393,7 +393,7 @@ write_bond_parameters(const NetplanNetDefinition* def, GString* s) g_string_append_printf(params, "\nGratuitousARP=%d", def->bond_params.gratuitous_arp); /* TODO: add unsolicited_na, not documented as supported by NM. */ if (def->bond_params.packets_per_member) - g_string_append_printf(params, "\nPacketsPerSlave=%d", def->bond_params.packets_per_member); /* wokeignore:rule=slave */ + g_string_append_printf(params, "\nPacketsPerSlave=%d", def->bond_params.packets_per_member); /* wokeignore:rule=slave */ if (def->bond_params.primary_reselect_policy) g_string_append_printf(params, "\nPrimaryReselectPolicy=%s", def->bond_params.primary_reselect_policy); if (def->bond_params.resend_igmp) From 2a1b4b86bd20765fd4b10bfe797791f9f0b7f372 Mon Sep 17 00:00:00 2001 From: Chris Aumann Date: Mon, 27 Nov 2023 17:24:12 +0100 Subject: [PATCH 2/2] networkd: replace deprecated CriticalConnection= by KeepConfiguration= --- src/networkd.c | 2 +- tests/generator/test_common.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/networkd.c b/src/networkd.c index 74374d9b1..7ddd30568 100644 --- a/src/networkd.c +++ b/src/networkd.c @@ -922,7 +922,7 @@ netplan_netdef_write_network_file( } if (def->critical) - g_string_append_printf(network, "CriticalConnection=true\n"); + g_string_append_printf(network, "KeepConfiguration=true\n"); if (def->dhcp4 || def->dhcp6) { if (def->dhcp_identifier) diff --git a/tests/generator/test_common.py b/tests/generator/test_common.py index fda6d298c..c013010c4 100644 --- a/tests/generator/test_common.py +++ b/tests/generator/test_common.py @@ -482,7 +482,7 @@ def test_dhcp_critical_true(self): LinkLocalAddressing=ipv6 [DHCP] -CriticalConnection=true +KeepConfiguration=true '''}) def test_dhcp_identifier_mac(self):