From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 14 Feb 2010 00:03:24 +0000 (+0100)
Subject: device: fall back to device node path as description instead of kernel name
X-Git-Tag: 0.git+20100605+dfd8ee-1~301
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c18315a88da3864f29908ad299750f98e6160f42;p=systemd

device: fall back to device node path as description instead of kernel name
---

diff --git a/device.c b/device.c
index c5901c95..1b0b50fd 100644
--- a/device.c
+++ b/device.c
@@ -162,9 +162,12 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u
                 }
 
                 if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
-                    (model = udev_device_get_property_value(dev, "ID_MODEL")))
+                    (model = udev_device_get_property_value(dev, "ID_MODEL"))) {
                         if ((r = unit_set_description(u, model)) < 0)
                                 goto fail;
+                } else if (dn)
+                        if ((r = unit_set_description(u, dn)) < 0)
+                                goto fail;
 
                 unit_add_to_load_queue(u);
         } else {