diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-06-11 07:53:44 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-06-11 12:48:15 -0500 |
| commit | b10c4778c036edcf1f7fe474bbf0f871762b3506 (patch) | |
| tree | 2d362e2c1ec696d8b789d640fab10c683727f148 /libnm-glib | |
| parent | 77dda53b502c75831cae99f480d830091ef715fa (diff) | |
libnm-glib: fix device description with newer udev versions
At some point ID_MODEL_FROM_DATABASE became what we should look for; fixes
device description not being constructed for many devices.
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/nm-device.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c index 43a5932220..a40d2636a6 100644 --- a/libnm-glib/nm-device.c +++ b/libnm-glib/nm-device.c @@ -1475,7 +1475,11 @@ nm_device_get_product (NMDevice *device) priv = NM_DEVICE_GET_PRIVATE (device); 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); } return priv->product; |