summaryrefslogtreecommitdiff
path: root/udev/udev-event.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-01-15 20:20:16 +0100
committerKay Sievers <kay.sievers@vrfy.org>2009-01-15 20:20:16 +0100
commitec2dd02e2a2748134f9c8347e12b802b42dea6b5 (patch)
tree657c7c50234f9c559ac7cb65cc2253361e29c609 /udev/udev-event.c
parent64b333fdcc69798ab7874cf042d590b3f2d990b5 (diff)
udevadm: test - remove --force option
Since a while we change the database with a "test" run, but do not update the node and symlinks. We need to "force" all the time, to keep things in sync.
Diffstat (limited to 'udev/udev-event.c')
-rw-r--r--udev/udev-event.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/udev/udev-event.c b/udev/udev-event.c
index 9e82f8de42..6d05594337 100644
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -472,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) {
@@ -593,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;
@@ -673,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;
}