colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: fix device description with newer udev versions

Browse Source 
At some point ID_MODEL_FROM_DATABASE became what we should look for; fixes
device description not being constructed for many devices.
This commit is contained in:
Dan Williams
2013-06-11 07:53:44 -05:00
parent 77dda53b50
commit b10c4778c0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libnm-glib/nm-device.c
View File

@@ -1475,7 +1475,11 @@ nm_device_get_product (NMDevice *device)
priv = NM_DEVICE_GET_PRIVATE (device); priv = NM_DEVICE_GET_PRIVATE (device);
if (!priv->product) { if (!priv->product) {
priv->product = _get_udev_property (device, "ID_MODEL_ENC", "ID_PRODUCT_FROM_DATABASE"); priv->product = _get_udev_property (device, "ID_MODEL_ENC", "ID_MODEL_FROM_DATABASE");
if (!priv->product) {
/* Sometimes ID_PRODUCT_FROM_DATABASE is used? */
priv->product = _get_udev_property (device, "ID_MODEL_ENC", "ID_PRODUCT_FROM_DATABASE");
}
_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT); _nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT);
} }
return priv->product; return priv->product;