mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-04 10:40:58 +01:00
Merge branch 'missing_veth_prop' into 'master'
nmtui: list veth devices when creating the connection See merge request NetworkManager/NetworkManager!708
This commit is contained in:
commit
871c34d94e
2 changed files with 9 additions and 0 deletions
|
|
@ -132,6 +132,14 @@ nm_editor_utils_get_connection_type_list(void)
|
|||
item->id_format = _("Ethernet connection %d");
|
||||
g_ptr_array_add(array, item);
|
||||
|
||||
item = g_new0(NMEditorConnectionTypeDataReal, 1);
|
||||
item->data.name = _("Veth");
|
||||
item->data.setting_type = NM_TYPE_SETTING_VETH;
|
||||
item->data.device_type = NM_TYPE_DEVICE_VETH;
|
||||
item->data.virtual = TRUE;
|
||||
item->id_format = _("Veth connection %d");
|
||||
g_ptr_array_add(array, item);
|
||||
|
||||
item = g_new0(NMEditorConnectionTypeDataReal, 1);
|
||||
item->data.name = _("Wi-Fi");
|
||||
item->data.setting_type = NM_TYPE_SETTING_WIRELESS;
|
||||
|
|
|
|||
|
|
@ -92,6 +92,7 @@ nmt_connect_device_free(NmtConnectDevice *nmtdev)
|
|||
}
|
||||
|
||||
static const char *device_sort_order[] = {"NMDeviceEthernet",
|
||||
"NMDeviceVeth",
|
||||
"NMDeviceInfiniband",
|
||||
"NMDeviceWifi",
|
||||
NM_SETTING_VLAN_SETTING_NAME,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue