chiark / gitweb /
volume_id: include stddef.h header
[elogind.git] / udev_remove.c
index 621fcc1960df0499e9d07adec2a79ed8cdbc7459..4d1b9286a0884a4d13ddf1c850c831be51aaab6e 100644 (file)
@@ -56,7 +56,7 @@ static int delete_path(const char *path)
                if (retval) {
                        if (errno == ENOTEMPTY)
                                return 0;
-                       dbg("rmdir(%s) failed: %s", path, strerror(errno));
+                       err("rmdir(%s) failed: %s", path, strerror(errno));
                        break;
                }
                dbg("removed '%s'", path);
@@ -152,8 +152,8 @@ int udev_remove_device(struct udevice *udev)
                dbg("remove name='%s'", udev->name);
                udev_db_delete_device(udev);
        } else {
-               dbg("'%s' not found in database, don't remove anything", udev->devpath);
-               return -1;
+               dbg("'%s' not found in database, using kernel name '%s'", udev->devpath, udev->kernel_name);
+               strlcpy(udev->name, udev->kernel_name, sizeof(udev->name));
        }
 
        return delete_node(udev);