chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove debug output during rules parsing
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index b2e1baee1f4d5484ef2144b6860ea420b5cee03c..1e7a2ea34c0a242d1d8c59b0f46babfcfe3a13d8 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-380,7
+380,7
@@
subst:
minor(udev_device_get_devnum(dev)));
if (event->tmp_node == NULL)
break;
minor(udev_device_get_devnum(dev)));
if (event->tmp_node == NULL)
break;
- udev_node_mknod(dev, event->tmp_node,
makedev(0, 0),
0600, 0, 0);
+ udev_node_mknod(dev, event->tmp_node, 0600, 0, 0);
l = util_strpcpy(&s, l, event->tmp_node);
break;
}
l = util_strpcpy(&s, l, event->tmp_node);
break;
}
@@
-543,8
+543,8
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
udev_device_read_db(dev);
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
udev_device_read_db(dev);
- udev_device_set_info_loaded(dev);
udev_device_delete_db(dev);
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
@@
-578,6
+578,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
/* delete stale db file */
udev_device_delete_db(dev);
/* delete stale db file */
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
/* remember old name */
udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
/* remember old name */
udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
@@
-619,6
+620,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
if (event->name == NULL) {
/* things went wrong */
udev_device_delete_db(dev);
if (event->name == NULL) {
/* things went wrong */
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
udev_device_unref(event->dev_db);
err = -ENOMEM;
goto out;
udev_device_unref(event->dev_db);
err = -ENOMEM;
goto out;
@@
-630,6
+632,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
}
udev_device_update_db(dev);
}
udev_device_update_db(dev);
+ udev_device_tag_index(dev, event->dev_db, true);
if (major(udev_device_get_devnum(dev)) != 0) {
/* remove/update possible left-over symlinks from old database entry */
if (major(udev_device_get_devnum(dev)) != 0) {
/* remove/update possible left-over symlinks from old database entry */