update TODO

[elogind.git] / udev_event.c

diff --git a/udev_event.c b/udev_event.c
index 3580ab937fcf774eaaf9ab20b68717fa7262a838..b50fbf4c1dd61df4f0fcf8cceeb74975bfa22651 100644 (file)
--- a/udev_event.c
+++ b/udev_event.c
@@ -73,13 +73,12 @@ int udev_process_event(struct udev_rules *rules, struct udevice *udev)
                                        sysfs_close_class_device(class_dev);
                                        return -1;
                                }
-                               if (udev->name[0] == '\0') {
+                               if (udev->name[0] != '\0') {
+                                       /* create node, store in db */
+                                       retval = udev_add_device(udev, class_dev);
+                               } else {
                                        info("device node creation supressed");
-                                       sysfs_close_class_device(class_dev);
-                                       return -1;
                                }
-                               /* create node, store in db */
-                               retval = udev_add_device(udev, class_dev);
                        } else {
                                dbg("no dev-file found");
                                udev_rules_get_run(rules, udev, class_dev, NULL);
@@ -91,15 +90,21 @@ int udev_process_event(struct udev_rules *rules, struct udevice *udev)
                        }
                        sysfs_close_class_device(class_dev);
                } else if (strcmp(udev->action, "remove") == 0) {
+                       struct name_entry *name_loop;
+
+                       /* get data from db, remove db-entry, delete node */
                        dbg("node remove");
+                       retval = udev_remove_device(udev);
+
+                       /* restore stored persistent data */
+                       list_for_each_entry(name_loop, &udev->env_list, node)
+                               putenv(name_loop->name);
+
                        udev_rules_get_run(rules, udev, NULL, NULL);
                        if (udev->ignore_device) {
                                dbg("device event will be ignored");
                                return -1;
                        }
-
-                       /* get name from db, remove db-entry, delete node */
-                       retval = udev_remove_device(udev);
                }
 
                /* export name of device node or netif */