do not import the "uevent" file when we only read the db to get old symlinks

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index db61d589250b8f056283e77333ed3b699486a968..fe579b49c7f7065d4b1c9a827e785468a3e973eb 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -583,23 +583,22 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                util_strlcat(filename, event->name, sizeof(filename));
                udev_device_set_devnode(dev, filename);
 
-               /* read current database entry; cleanup, if it is known device */
+               /* read current database entry */
                dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
                if (dev_old != NULL) {
-                       if (udev_device_get_devnode(dev_old) != NULL) {
-                               info(event->udev, "device node '%s' already in database, updating\n",
-                                    udev_device_get_devnode(dev_old));
-                               udev_node_update_old_links(dev, dev_old, event->test);
-                       }
-                       udev_device_unref(dev_old);
+                       udev_device_read_db(dev_old);
+                       udev_device_set_info_loaded(dev_old);
                }
 
+               /* update database, create node and symlinks */
                udev_device_update_db(dev);
-
                err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
-               if (err != 0)
-                       goto exit;
 
+               /* remove/update possible left-over symlinks from old database entry */
+               if (dev_old != NULL) {
+                       udev_node_update_old_links(dev, dev_old, event->test);
+                       udev_device_unref(dev_old);
+               }
                goto exit;
        }
 
@@ -646,8 +645,8 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
                /* import database entry and delete it */
                udev_device_read_db(dev);
-               if (!event->test)
-                       udev_device_delete_db(dev);
+               udev_device_set_info_loaded(dev);
+               udev_device_delete_db(dev);
 
                if (udev_device_get_devnode(dev) == NULL) {
                        char devnode[UTIL_PATH_SIZE];