From eba6e2d5f34bea51064cb6f0303255acf3196abf Mon Sep 17 00:00:00 2001

From: Beniamino Galvani <bgalvani@redhat.com>

Date: Wed, 10 Mar 2021 09:18:59 +0100

Subject: [PATCH 1/2] initrd: fix may-fail for IPv6

(cherry picked from commit 5f736465249fd16115120f022aa0eb5ddf0b2bfc)

(cherry picked from commit 1bf1a902beea3a1b9505cf8c9177d74cfea859b3)

---

 src/core/initrd/nmi-cmdline-reader.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c

index e3ecc7d969..6d3b2b7dda 100644

--- a/src/core/initrd/nmi-cmdline-reader.c

+++ b/src/core/initrd/nmi-cmdline-reader.c

@@ -599,7 +599,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)

                          NULL);

         }

     } else if (NM_IN_STRSET(kind, "auto6", "dhcp6")) {

-        g_object_set(s_ip4, NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, NULL);

+        g_object_set(s_ip6, NM_SETTING_IP_CONFIG_MAY_FAIL, FALSE, NULL);

         if (nm_setting_ip_config_get_num_addresses(s_ip4) == 0) {

             g_object_set(s_ip4,

                          NM_SETTING_IP_CONFIG_METHOD,

-- 

2.29.2

From 118d46a3122ac35b0e4447c976f77a4ccdbdea33 Mon Sep 17 00:00:00 2001

From: Beniamino Galvani <bgalvani@redhat.com>

Date: Thu, 11 Mar 2021 09:15:37 +0100

Subject: [PATCH 2/2] initrd: set multi-connect=single for connections with

 static IP

We don't want to have multiple devices up with the same static IP. Set

multi-connect=single.

https://bugzilla.redhat.com/show_bug.cgi?id=1915493

(cherry picked from commit c27626a0ce4da8438503d764815542927def6dce)

(cherry picked from commit fafefc71f826643ce8279f6a88f97d03f92e8422)

---

 src/core/initrd/nmi-cmdline-reader.c        | 12 +++++-

 src/core/initrd/tests/test-cmdline-reader.c | 42 +++++++++++++++++++++

 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/core/initrd/nmi-cmdline-reader.c b/src/core/initrd/nmi-cmdline-reader.c

index 6d3b2b7dda..eae75847ee 100644

--- a/src/core/initrd/nmi-cmdline-reader.c

+++ b/src/core/initrd/nmi-cmdline-reader.c

@@ -393,8 +393,9 @@ reader_read_all_connections_from_fw(Reader *reader, const char *sysfs_dir)

 static void

 reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)

 {

-    NMConnection *     connection;

-    NMSettingIPConfig *s_ip4 = NULL, *s_ip6 = NULL;

+    NMConnection *       connection;

+    NMSettingConnection *s_con;

+    NMSettingIPConfig *  s_ip4 = NULL, *s_ip6 = NULL;

     gs_unref_hashtable GHashTable *ibft = NULL;

     const char *                   tmp;

     const char *                   tmp2;

@@ -495,6 +496,7 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)

     g_hash_table_add(reader->explicit_ip_connections, g_object_ref(connection));

+    s_con = nm_connection_get_setting_connection(connection);

     s_ip4 = nm_connection_get_setting_ip4_config(connection);

     s_ip6 = nm_connection_get_setting_ip6_config(connection);

@@ -544,6 +546,12 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)

             nm_assert_not_reached();

         if (address) {

+            /* We don't want to have multiple devices up with the

+             * same static address. */

+            g_object_set(s_con,

+                         NM_SETTING_CONNECTION_MULTI_CONNECT,

+                         NM_CONNECTION_MULTI_CONNECT_SINGLE,

+                         NULL);

             switch (client_ip_family) {

             case AF_INET:

                 g_object_set(s_ip4,

diff --git a/src/core/initrd/tests/test-cmdline-reader.c b/src/core/initrd/tests/test-cmdline-reader.c

index ba072e7933..187d61c9dc 100644

--- a/src/core/initrd/tests/test-cmdline-reader.c

+++ b/src/core/initrd/tests/test-cmdline-reader.c

@@ -455,6 +455,47 @@ test_if_ip4_manual(void)

     g_assert(nm_setting_ip_config_get_may_fail(s_ip6));

 }

+static void

+test_if_ip4_manual_no_dev(void)

+{

+    gs_unref_hashtable GHashTable *connections = NULL;

+    const char *const *            ARGV        = NM_MAKE_STRV("ip=192.0.2.2::192.0.2.1:24:::");

+    NMConnection *                 connection;

+    NMSettingConnection *          s_con;

+    NMSettingIPConfig *            s_ip4;

+    NMSettingIPConfig *            s_ip6;

+    NMIPAddress *                  ip_addr;

+

+    connection = _parse_con(ARGV, "default_connection");

+    g_assert_cmpstr(nm_connection_get_id(connection), ==, "Wired Connection");

+

+    s_con = nm_connection_get_setting_connection(connection);

+    g_assert(s_con);

+    g_assert_cmpint(nm_setting_connection_get_wait_device_timeout(s_con), ==, -1);

+    g_assert_cmpint(nm_setting_connection_get_multi_connect(s_con),

+                    ==,

+                    NM_CONNECTION_MULTI_CONNECT_SINGLE);

+

+    s_ip4 = nm_connection_get_setting_ip4_config(connection);

+    g_assert(s_ip4);

+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip4),

+                    ==,

+                    NM_SETTING_IP4_CONFIG_METHOD_MANUAL);

+    g_assert(!nm_setting_ip_config_get_ignore_auto_dns(s_ip4));

+    g_assert_cmpint(nm_setting_ip_config_get_num_routes(s_ip4), ==, 0);

+    g_assert_cmpint(nm_setting_ip_config_get_num_addresses(s_ip4), ==, 1);

+    ip_addr = nm_setting_ip_config_get_address(s_ip4, 0);

+    g_assert(ip_addr);

+    g_assert_cmpstr(nm_ip_address_get_address(ip_addr), ==, "192.0.2.2");

+    g_assert_cmpint(nm_ip_address_get_prefix(ip_addr), ==, 24);

+    g_assert_cmpstr(nm_setting_ip_config_get_gateway(s_ip4), ==, "192.0.2.1");

+

+    s_ip6 = nm_connection_get_setting_ip6_config(connection);

+    g_assert(s_ip6);

+    g_assert_cmpstr(nm_setting_ip_config_get_method(s_ip6), ==, NM_SETTING_IP6_CONFIG_METHOD_AUTO);

+    g_assert(nm_setting_ip_config_get_may_fail(s_ip6));

+}

+

 static void

 test_if_ip6_manual(void)

 {

@@ -2165,6 +2206,7 @@ main(int argc, char **argv)

     g_test_add_func("/initrd/cmdline/if_dhcp6", test_if_dhcp6);

     g_test_add_func("/initrd/cmdline/if_auto_with_mtu_and_mac", test_if_auto_with_mtu_and_mac);

     g_test_add_func("/initrd/cmdline/if_ip4_manual", test_if_ip4_manual);

+    g_test_add_func("/initrd/cmdline/if_ip4_manual_no_dev", test_if_ip4_manual_no_dev);

     g_test_add_func("/initrd/cmdline/if_ip6_manual", test_if_ip6_manual);

     g_test_add_func("/initrd/cmdline/if_mac_ifname", test_if_mac_ifname);

     g_test_add_func("/initrd/cmdline/if_off", test_if_off);

-- 

2.29.2