rules: fix typo in ide cd rule

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 32b45e9baca6c039932b4b875b4b03b15425d9a7..9e82f8de42f1baaf7ae2cfd29972b31cbe14a8af 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -421,14 +421,9 @@ found:
                                dbg(event->udev, "missing attribute\n");
                                break;
                        } else {
-                               struct udev_list_entry *list_entry;
                                const char *value;
 
-                               list_entry = udev_device_get_properties_list_entry(event->dev);
-                               list_entry = udev_list_entry_get_by_name(list_entry, attr);
-                               if (list_entry == NULL)
-                                       break;
-                               value = udev_list_entry_get_value(list_entry);
+                               value = udev_device_get_property_value(event->dev, attr);
                                if (value == NULL)
                                        break;
                                dbg(event->udev, "substitute env '%s=%s'\n", attr, value);
@@ -514,7 +509,7 @@ static int rename_netif(struct udev_event *event)
 
                /* wait 30 seconds for our target to become available */
                util_strlcpy(ifr.ifr_name, ifr.ifr_newname, IFNAMSIZ);
-               util_strlcpy(ifr.ifr_newname, udev_device_get_devnode(dev), IFNAMSIZ);
+               util_strlcpy(ifr.ifr_newname, event->name, IFNAMSIZ);
                loop = 30 * 20;
                while (loop--) {
                        err = ioctl(sk, SIOCSIFNAME, &ifr);
@@ -529,7 +524,7 @@ static int rename_netif(struct udev_event *event)
                                break;
                        }
                        dbg(event->udev, "wait for netif '%s' to become free, loop=%i\n",
-                           udev_device_get_devnode(dev), (30 * 20) - loop);
+                           event->name, (30 * 20) - loop);
                        usleep(1000 * 1000 / 20);
                }
        }
@@ -611,6 +606,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        /* add netif */
        if (strcmp(udev_device_get_subsystem(dev), "net") == 0 && strcmp(udev_device_get_action(dev), "add") == 0) {
                dbg(event->udev, "netif add '%s'\n", udev_device_get_devpath(dev));
+               udev_device_delete_db(dev);
 
                udev_rules_apply_to_event(rules, event);
                if (event->ignore_device) {
@@ -644,6 +640,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                                info(event->udev, "changed devpath to '%s'\n", udev_device_get_devpath(dev));
                        }
                }
+               udev_device_update_db(dev);
                goto exit;
        }
 
@@ -684,6 +681,11 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
        udev_rules_apply_to_event(rules, event);
        if (event->ignore_device)
                info(event->udev, "device event will be ignored\n");
+
+       if (strcmp(udev_device_get_action(dev), "remove") != 0)
+               udev_device_update_db(dev);
+       else
+               udev_device_delete_db(dev);
 exit:
        return err;
 }