diff options
| author | Fernando Fernández Mancera <ffmancera@riseup.net> | 2020-12-22 09:46:17 +0000 |
|---|---|---|
| committer | Fernando Fernández Mancera <ffmancera@riseup.net> | 2020-12-22 09:46:17 +0000 |
| commit | 871c34d94eb655e29ca0620f0217531334723d31 (patch) | |
| tree | b399a614cb52cc5521cdde7023ec36a7ad60b79d | |
| parent | 2fa8ef9fb9c7fe0cc2d9523eed6c5a3749b05175 (diff) | |
| parent | cf89e428af30a0019a70e841bea38a0a201f542d (diff) | |
| download | NetworkManager-871c34d94eb655e29ca0620f0217531334723d31.tar.gz | |
Merge branch 'missing_veth_prop' into 'master'
nmtui: list veth devices when creating the connection
See merge request NetworkManager/NetworkManager!708
| -rw-r--r-- | clients/tui/nm-editor-utils.c | 8 | ||||
| -rw-r--r-- | clients/tui/nmt-connect-connection-list.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/clients/tui/nm-editor-utils.c b/clients/tui/nm-editor-utils.c index e85a41bc9e..b71f814d91 100644 --- a/clients/tui/nm-editor-utils.c +++ b/clients/tui/nm-editor-utils.c @@ -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; diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c index 95b021999e..3e8986d3b0 100644 --- a/clients/tui/nmt-connect-connection-list.c +++ b/clients/tui/nmt-connect-connection-list.c @@ -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, |