mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-14 20:18:39 +00:00
Fix capitalization of "InfiniBand"
"InfiniBand" has a capital "B". Fix that everywhere it's being used as a human-readable string. In particular, the RH initscripts recognize "TYPE=infiniband" and "TYPE=InfiniBand", but not "TYPE=Infiniband", which is what we were writing before.
This commit is contained in:
parent
4fc8b8ccd0
commit
49214066a4
|
@ -1431,14 +1431,14 @@ check_infiniband_compatible (NMDeviceInfiniband *device, NMConnection *connectio
|
|||
connection_type = nm_setting_connection_get_connection_type (s_con);
|
||||
if (strcmp (connection_type, NM_SETTING_INFINIBAND_SETTING_NAME)) {
|
||||
g_set_error (error, 0, 0,
|
||||
"The connection was not an Infiniband connection.");
|
||||
"The connection was not an InfiniBand connection.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
s_infiniband = nm_connection_get_setting_infiniband (connection);
|
||||
if (!s_infiniband) {
|
||||
g_set_error (error, 0, 0,
|
||||
"The connection was not a valid Infiniband connection.");
|
||||
"The connection was not a valid InfiniBand connection.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -419,7 +419,7 @@ device_reason_to_string (NMDeviceStateReason reason)
|
|||
return _("GSM Modem's SIM wrong");
|
||||
|
||||
case NM_DEVICE_STATE_REASON_INFINIBAND_MODE:
|
||||
return _("Infiniband device does not support connected mode");
|
||||
return _("InfiniBand device does not support connected mode");
|
||||
|
||||
case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
|
||||
return _("A dependency of the connection failed");
|
||||
|
|
|
@ -104,7 +104,7 @@ typedef enum {
|
|||
* @NM_DEVICE_TYPE_WIMAX: an 802.16e Mobile WiMAX broadband device
|
||||
* @NM_DEVICE_TYPE_MODEM: a modem supporting analog telephone, CDMA/EVDO,
|
||||
* GSM/UMTS, or LTE network access protocols
|
||||
* @NM_DEVICE_TYPE_INFINIBAND: an IP-over-Infiniband device
|
||||
* @NM_DEVICE_TYPE_INFINIBAND: an IP-over-InfiniBand device
|
||||
* @NM_DEVICE_TYPE_BOND: a bond master interface
|
||||
*
|
||||
* #NMDeviceType values indicate the type of hardware represented by
|
||||
|
@ -484,7 +484,7 @@ typedef enum {
|
|||
/* GSM Modem's SIM wrong */
|
||||
NM_DEVICE_STATE_REASON_GSM_SIM_WRONG = 48,
|
||||
|
||||
/* Infiniband device does not support connected mode */
|
||||
/* InfiniBand device does not support connected mode */
|
||||
NM_DEVICE_STATE_REASON_INFINIBAND_MODE = 49,
|
||||
|
||||
/* A dependency of the connection failed */
|
||||
|
|
|
@ -243,7 +243,7 @@
|
|||
</tp:enumvalue>
|
||||
<tp:enumvalue suffix="INFINIBAND" value="9">
|
||||
<tp:docstring>
|
||||
The device is an IP-capable Infiniband interface.
|
||||
The device is an IP-capable InfiniBand interface.
|
||||
</tp:docstring>
|
||||
</tp:enumvalue>
|
||||
<tp:enumvalue suffix="BOND" value="10">
|
||||
|
@ -518,7 +518,7 @@
|
|||
</tp:enumvalue>
|
||||
<tp:enumvalue suffix="INFINIBAND_MODE" value="49">
|
||||
<tp:docstring>
|
||||
Infiniband device does not support connected mode.
|
||||
InfiniBand device does not support connected mode.
|
||||
</tp:docstring>
|
||||
</tp:enumvalue>
|
||||
<tp:enumvalue suffix="DEPENDENCY_FAILED" value="50">
|
||||
|
|
|
@ -28,11 +28,11 @@
|
|||
|
||||
/**
|
||||
* SECTION:nm-setting-infiniband
|
||||
* @short_description: Describes connection properties for IP-over-Infiniband networks
|
||||
* @short_description: Describes connection properties for IP-over-InfiniBand networks
|
||||
* @include: nm-setting-infiniband.h
|
||||
*
|
||||
* The #NMSettingInfiniband object is a #NMSetting subclass that describes properties
|
||||
* necessary for connection to IP-over-Infiniband networks.
|
||||
* necessary for connection to IP-over-InfiniBand networks.
|
||||
**/
|
||||
|
||||
/**
|
||||
|
|
8
po/hu.po
8
po/hu.po
|
@ -1150,8 +1150,8 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "A GSM modem SIM kódja hibás"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgstr "Az Infiniband eszköz nem támogatja a csatlakoztatott módot"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr "Az InfiniBand eszköz nem támogatja a csatlakoztatott módot"
|
||||
|
||||
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
|
||||
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
|
||||
|
@ -2561,8 +2561,8 @@ msgstr "%d. vezetékes kapcsolat"
|
|||
#: ../src/nm-device-infiniband.c:332
|
||||
#, c-format
|
||||
#| msgid "Wired connection %d"
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "%d. Infiniband kapcsolat"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "%d. InfiniBand kapcsolat"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:323
|
||||
#, c-format
|
||||
|
|
6
po/ml.po
6
po/ml.po
|
@ -1096,7 +1096,7 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "GSM മോഡത്തിന്റെ സിം തെറ്റാണ്"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr ""
|
||||
|
||||
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
|
||||
|
@ -2449,8 +2449,8 @@ msgstr "Wired കണക്ഷന് %d"
|
|||
|
||||
#: ../src/nm-device-infiniband.c:303
|
||||
#, c-format
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "Infiniband കണക്ഷന് %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "InfiniBand കണക്ഷന് %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:293
|
||||
#, c-format
|
||||
|
|
8
po/pl.po
8
po/pl.po
|
@ -1098,8 +1098,8 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "Karta SIM modemu GSM jest błędna"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgstr "Urządzenie Infiniband nie obsługuje trybu połączonego"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr "Urządzenie InfiniBand nie obsługuje trybu połączonego"
|
||||
|
||||
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
|
||||
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
|
||||
|
@ -2497,8 +2497,8 @@ msgstr "Połączenie przewodowe %d"
|
|||
|
||||
#: ../src/nm-device-infiniband.c:303
|
||||
#, c-format
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "Połączenie Infiniband %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "Połączenie InfiniBand %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:293
|
||||
#, c-format
|
||||
|
|
|
@ -1099,8 +1099,8 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "SIM do modem GSM errado"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgstr "Dispositivo Infiniband não oferece suporte ao modo conectado"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr "Dispositivo InfiniBand não oferece suporte ao modo conectado"
|
||||
|
||||
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
|
||||
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
|
||||
|
@ -2487,8 +2487,8 @@ msgstr "Conexão cabeada %d"
|
|||
|
||||
#: ../src/nm-device-infiniband.c:302
|
||||
#, c-format
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "Conexão Infiniband %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "Conexão InfiniBand %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:293
|
||||
#, c-format
|
||||
|
|
8
po/sl.po
8
po/sl.po
|
@ -1206,8 +1206,8 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "Kartica SIM modema GSM ni ustrezna"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgstr "Naprava Infiniband ne podpira povezanega načina"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr "Naprava InfiniBand ne podpira povezanega načina"
|
||||
|
||||
#: ../cli/src/devices.c:423
|
||||
#: ../cli/src/devices.c:446
|
||||
|
@ -2576,8 +2576,8 @@ msgstr "Žična povezava %d"
|
|||
|
||||
#: ../src/nm-device-infiniband.c:302
|
||||
#, c-format
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "Povezava Infiniband %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "Povezava InfiniBand %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:293
|
||||
#, c-format
|
||||
|
|
4
po/tr.po
4
po/tr.po
|
@ -2055,8 +2055,8 @@ msgstr "Kablolu bağlantı %d"
|
|||
|
||||
#: ../src/nm-device-infiniband.c:292
|
||||
#, c-format
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "Infiniband bağlantısı %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "InfiniBand bağlantısı %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:323
|
||||
#, c-format
|
||||
|
|
8
po/uk.po
8
po/uk.po
|
@ -1155,8 +1155,8 @@ msgid "GSM Modem's SIM wrong"
|
|||
msgstr "Помилкова SIM-картка у модемі GSM"
|
||||
|
||||
#: ../cli/src/devices.c:421
|
||||
msgid "Infiniband device does not support connected mode"
|
||||
msgstr "У пристрої Infiniband не передбачено режиму з’єднання"
|
||||
msgid "InfiniBand device does not support connected mode"
|
||||
msgstr "У пристрої InfiniBand не передбачено режиму з’єднання"
|
||||
|
||||
#: ../cli/src/devices.c:423 ../cli/src/devices.c:446 ../cli/src/devices.c:458
|
||||
#: ../cli/src/devices.c:578 ../cli/src/devices.c:622
|
||||
|
@ -2562,8 +2562,8 @@ msgstr "Дротове з’єднання %d"
|
|||
#: ../src/nm-device-infiniband.c:332
|
||||
#, c-format
|
||||
#| msgid "Wired connection %d"
|
||||
msgid "Infiniband connection %d"
|
||||
msgstr "З’єднання Infiniband %d"
|
||||
msgid "InfiniBand connection %d"
|
||||
msgstr "З’єднання InfiniBand %d"
|
||||
|
||||
#: ../src/nm-device-olpc-mesh.c:323
|
||||
#, c-format
|
||||
|
|
|
@ -115,7 +115,7 @@ nm_device_infiniband_new (const char *udi,
|
|||
NM_DEVICE_UDI, udi,
|
||||
NM_DEVICE_IFACE, iface,
|
||||
NM_DEVICE_DRIVER, driver,
|
||||
NM_DEVICE_TYPE_DESC, "Infiniband",
|
||||
NM_DEVICE_TYPE_DESC, "InfiniBand",
|
||||
NM_DEVICE_DEVICE_TYPE, NM_DEVICE_TYPE_INFINIBAND,
|
||||
NULL);
|
||||
}
|
||||
|
@ -258,7 +258,7 @@ real_check_connection_compatible (NMDevice *device,
|
|||
g_set_error (error,
|
||||
NM_INFINIBAND_ERROR,
|
||||
NM_INFINIBAND_ERROR_CONNECTION_NOT_INFINIBAND,
|
||||
"The connection was not an Infiniband connection.");
|
||||
"The connection was not an InfiniBand connection.");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
@ -300,7 +300,7 @@ real_complete_connection (NMDevice *device,
|
|||
nm_utils_complete_generic (connection,
|
||||
NM_SETTING_INFINIBAND_SETTING_NAME,
|
||||
existing_connections,
|
||||
_("Infiniband connection %d"),
|
||||
_("InfiniBand connection %d"),
|
||||
NULL,
|
||||
TRUE);
|
||||
|
||||
|
|
|
@ -946,7 +946,7 @@ find_vlan_parent (NMManager *self,
|
|||
|
||||
/* The 'parent' property could be either an interface name, a connection
|
||||
* UUID, or even given by the MAC address of the connection's ethernet,
|
||||
* Infiniband, or WiFi setting.
|
||||
* InfiniBand, or WiFi setting.
|
||||
*/
|
||||
s_vlan = nm_connection_get_setting_vlan (connection);
|
||||
g_return_val_if_fail (s_vlan != NULL, NULL);
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
|
||||
#define TYPE_ETHERNET "Ethernet"
|
||||
#define TYPE_WIRELESS "Wireless"
|
||||
#define TYPE_INFINIBAND "Infiniband"
|
||||
#define TYPE_INFINIBAND "InfiniBand"
|
||||
#define TYPE_BRIDGE "Bridge"
|
||||
#define TYPE_BOND "Bond"
|
||||
#define TYPE_VLAN "Vlan"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
TYPE=Infiniband
|
||||
TYPE=InfiniBand
|
||||
DEVICE=ib0
|
||||
HWADDR=80:00:11:22:33:44:55:66:77:88:99:aa:bb:cc:dd:ee:ff:00:11:22
|
||||
CONNECTED_MODE=yes
|
||||
|
|
|
@ -12508,14 +12508,14 @@ test_write_infiniband (void)
|
|||
|
||||
uuid = nm_utils_uuid_generate ();
|
||||
g_object_set (s_con,
|
||||
NM_SETTING_CONNECTION_ID, "Test Write Infiniband",
|
||||
NM_SETTING_CONNECTION_ID, "Test Write InfiniBand",
|
||||
NM_SETTING_CONNECTION_UUID, uuid,
|
||||
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
|
||||
NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME,
|
||||
NULL);
|
||||
g_free (uuid);
|
||||
|
||||
/* Infiniband setting */
|
||||
/* InfiniBand setting */
|
||||
s_infiniband = (NMSettingInfiniband *) nm_setting_infiniband_new ();
|
||||
ASSERT (s_infiniband != NULL,
|
||||
"infiniband-write", "failed to allocate new %s setting",
|
||||
|
|
|
@ -14,7 +14,7 @@ KEYFILES = \
|
|||
Test_Wired_TLS_New \
|
||||
Test_Wired_TLS_Blob \
|
||||
Test_Wired_TLS_Path_Missing \
|
||||
Test_Infiniband_Connection
|
||||
Test_InfiniBand_Connection
|
||||
|
||||
CERTS = \
|
||||
test-ca-cert.pem \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[connection]
|
||||
id=Test Infiniband Connection
|
||||
id=Test InfiniBand Connection
|
||||
uuid=4e80a56d-c99f-4aad-a6dd-b449bc398c57
|
||||
type=infiniband
|
||||
|
|
@ -2830,7 +2830,7 @@ test_write_wired_8021x_tls_connection_blob (void)
|
|||
g_object_unref (connection);
|
||||
}
|
||||
|
||||
#define TEST_INFINIBAND_FILE TEST_KEYFILES_DIR"/Test_Infiniband_Connection"
|
||||
#define TEST_INFINIBAND_FILE TEST_KEYFILES_DIR"/Test_InfiniBand_Connection"
|
||||
|
||||
static void
|
||||
test_read_infiniband_connection (void)
|
||||
|
@ -2843,7 +2843,7 @@ test_read_infiniband_connection (void)
|
|||
guint8 expected_mac[INFINIBAND_ALEN] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
|
||||
0x77, 0x88, 0x99, 0x01, 0x12, 0x23, 0x34, 0x45, 0x56, 0x67, 0x78, 0x89,
|
||||
0x90 };
|
||||
const char *expected_id = "Test Infiniband Connection";
|
||||
const char *expected_id = "Test InfiniBand Connection";
|
||||
const char *expected_uuid = "4e80a56d-c99f-4aad-a6dd-b449bc398c57";
|
||||
gboolean success;
|
||||
|
||||
|
@ -2860,7 +2860,7 @@ test_read_infiniband_connection (void)
|
|||
g_assert_cmpstr (nm_setting_connection_get_id (s_con), ==, expected_id);
|
||||
g_assert_cmpstr (nm_setting_connection_get_uuid (s_con), ==, expected_uuid);
|
||||
|
||||
/* Infiniband setting */
|
||||
/* InfiniBand setting */
|
||||
s_ib = nm_connection_get_setting_infiniband (connection);
|
||||
g_assert (s_ib);
|
||||
|
||||
|
@ -2903,14 +2903,14 @@ test_write_infiniband_connection (void)
|
|||
|
||||
uuid = nm_utils_uuid_generate ();
|
||||
g_object_set (s_con,
|
||||
NM_SETTING_CONNECTION_ID, "Work Infiniband",
|
||||
NM_SETTING_CONNECTION_ID, "Work InfiniBand",
|
||||
NM_SETTING_CONNECTION_UUID, uuid,
|
||||
NM_SETTING_CONNECTION_AUTOCONNECT, FALSE,
|
||||
NM_SETTING_CONNECTION_TYPE, NM_SETTING_INFINIBAND_SETTING_NAME,
|
||||
NULL);
|
||||
g_free (uuid);
|
||||
|
||||
/* Infiniband setting */
|
||||
/* InfiniBand setting */
|
||||
s_ib = (NMSettingInfiniband *) nm_setting_infiniband_new ();
|
||||
g_assert (s_ib);
|
||||
nm_connection_add_setting (connection, NM_SETTING (s_ib));
|
||||
|
|
Loading…
Reference in a new issue