New upstream version 1.48.8 upstream/1.48.8

1 files changed, 24 insertions, 21 deletions

diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index 8fcfc6d0..3703ff0c 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -232,7 +232,7 @@ reader_get_connection(Reader     *reader,
 
         /*
          * If ifname was not given, we'll match the connection by type.
-         * If the type was not given either, then we're happy with any connection but slaves.
+         * If the type was not given either, then we're happy with any connection but ports.
          * This is so that things like "bond=bond0:eth1,eth2 nameserver=1.3.3.7 end up
          * slapping the nameserver to the most reasonable connection (bond0).
          */
@@ -866,25 +866,28 @@ reader_parse_ip(Reader *reader, const char *sysfs_dir, char *argument)
 }
 
 static void
-reader_parse_master(Reader *reader, char *argument, const char *type_name, const char *default_name)
+reader_parse_controller(Reader     *reader,
+                        char       *argument,
+                        const char *type_name,
+                        const char *default_name)
 {
     NMConnection        *connection;
     NMSettingConnection *s_con;
-    gs_free char        *master_to_free = NULL;
-    const char          *master;
-    char                *slaves;
-    const char          *slave;
+    gs_free char        *controller_to_free = NULL;
+    const char          *controller;
+    char                *ports;
+    const char          *port;
     char                *opts;
     const char          *mtu = NULL;
 
-    master = get_word(&argument, ':');
-    if (!master)
-        master = master_to_free = g_strdup_printf("%s0", default_name ?: type_name);
-    slaves = get_word(&argument, ':');
+    controller = get_word(&argument, ':');
+    if (!controller)
+        controller = controller_to_free = g_strdup_printf("%s0", default_name ?: type_name);
+    ports = get_word(&argument, ':');
 
-    connection = reader_get_connection(reader, master, type_name, TRUE);
+    connection = reader_get_connection(reader, controller, type_name, TRUE);
     s_con      = nm_connection_get_setting_connection(connection);
-    master     = nm_setting_connection_get_uuid(s_con);
+    controller = nm_setting_connection_get_uuid(s_con);
 
     if (nm_streq(type_name, NM_SETTING_BRIDGE_SETTING_NAME)) {
         NMSettingBridge *s_bridge = nm_connection_get_setting_bridge(connection);
@@ -921,19 +924,19 @@ reader_parse_master(Reader *reader, char *argument, const char *type_name, const
         connection_set(connection, NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MTU, mtu);
 
     do {
-        slave = get_word(&slaves, ',');
-        if (slave == NULL)
-            slave = "eth0";
+        port = get_word(&ports, ',');
+        if (port == NULL)
+            port = "eth0";
 
-        connection = reader_get_connection(reader, slave, NULL, TRUE);
+        connection = reader_get_connection(reader, port, NULL, TRUE);
         s_con      = nm_connection_get_setting_connection(connection);
         g_object_set(s_con,
                      NM_SETTING_CONNECTION_PORT_TYPE,
                      type_name,
                      NM_SETTING_CONNECTION_CONTROLLER,
-                     master,
+                     controller,
                      NULL);
-    } while (slaves && *slaves != '\0');
+    } while (ports && *ports != '\0');
 
     if (argument && *argument)
         _LOGW(LOGD_CORE, "Ignoring extra: '%s'.", argument);
@@ -1468,11 +1471,11 @@ nmi_cmdline_reader_parse(const char        *etc_connections_dir,
                 routes = g_ptr_array_new_with_free_func(g_free);
             g_ptr_array_add(routes, g_strdup(argument));
         } else if (nm_streq(tag, "bridge"))
-            reader_parse_master(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br");
+            reader_parse_controller(reader, argument, NM_SETTING_BRIDGE_SETTING_NAME, "br");
         else if (nm_streq(tag, "bond"))
-            reader_parse_master(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL);
+            reader_parse_controller(reader, argument, NM_SETTING_BOND_SETTING_NAME, NULL);
         else if (nm_streq(tag, "team"))
-            reader_parse_master(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL);
+            reader_parse_controller(reader, argument, NM_SETTING_TEAM_SETTING_NAME, NULL);
         else if (nm_streq(tag, "vlan"))
             reader_parse_vlan(reader, argument);
         else if (nm_streq(tag, "ib.pkey"))