udevadm: test - remove --force option

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

diff --git a/udev/udev-event.c b/udev/udev-event.c
index bc692392d2b128298f9e8b3ca7c8cbf98b564634..6d055943371ac241ca2b59af2ddf8ad2e4801080 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);
@@ -477,8 +472,6 @@ static int rename_netif(struct udev_event *event)
 
        info(event->udev, "changing net interface name from '%s' to '%s'\n",
             udev_device_get_sysname(dev), event->name);
-       if (event->test)
-               return 0;
 
        sk = socket(PF_INET, SOCK_DGRAM, 0);
        if (sk < 0) {
@@ -598,11 +591,11 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                /* update database, create node and symlinks */
                udev_device_update_db(dev);
-               err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
+               err = udev_node_add(dev, event->mode, event->uid, event->gid);
 
                /* 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_node_update_old_links(dev, dev_old);
                        udev_device_unref(dev_old);
                }
                goto exit;
@@ -611,6 +604,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 +638,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;
        }
 
@@ -676,7 +671,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                        goto exit;
                }
 
-               err = udev_node_remove(dev, event->test);
+               err = udev_node_remove(dev);
                goto exit;
        }
 
@@ -684,6 +679,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;
 }