From b19b800c954ff063245cb9cf605bb807624e29c4 Mon Sep 17 00:00:00 2001 From: Fernando Fernandez Mancera Date: Mon, 14 Dec 2020 11:29:59 +0100 Subject: [PATCH] libnm: adjust nm_device_get_type_description for Veth Veth interfaces should be shown as Ethernet from nm_device_get_type_description in order to provide backward compatibility. Signed-off-by: Fernando Fernandez Mancera --- libnm/nm-device.c | 5 ++++- src/devices/nm-device.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libnm/nm-device.c b/libnm/nm-device.c index c57f7ce659..5b55cf80b2 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -1223,8 +1223,11 @@ nm_device_get_type_description(NMDevice *device) } typename = G_OBJECT_TYPE_NAME(device); - if (g_str_has_prefix(typename, "NMDevice")) + if (g_str_has_prefix(typename, "NMDevice")) { typename += 8; + if (nm_streq(typename, "Veth")) + typename = "Ethernet"; + } priv->type_description = g_ascii_strdown(typename, -1); return _nml_coerce_property_str_not_empty(priv->type_description); diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 38be8c8002..e27b71c6f2 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -3778,8 +3778,11 @@ get_type_description(NMDevice *self) gs_free char *s = NULL; typename = G_OBJECT_TYPE_NAME(self); - if (g_str_has_prefix(typename, "NMDevice")) + if (g_str_has_prefix(typename, "NMDevice")) { typename += 8; + if (nm_streq(typename, "Veth")) + typename = "Ethernet"; + } s = g_ascii_strdown(typename, -1); klass->default_type_description = g_intern_string(s); klass->default_type_description_klass = klass;