chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expose delayed name resolution
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 93a65e7352602b27d3a993a1e62d3516ffb9f40a..4b00cab30d1f989b3b542a8e7ae6159b8cf28c68 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 {
dbg(event->udev, "missing attribute\n");
break;
} else {
- struct udev_list_entry *list_entry;
const char *value;
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);
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);
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) {
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
@@
-589,22
+582,24
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
util_strlcat(filename, event->name, sizeof(filename));
udev_device_set_devnode(dev, filename);
- /* read
current
database entry */
+ /* read
old
database entry */
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
udev_device_read_db(dev_old);
udev_device_set_info_loaded(dev_old);
}
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
udev_device_read_db(dev_old);
udev_device_set_info_loaded(dev_old);
}
- /*
update database, create node and symlinks
*/
+ /*
write current database entry
*/
udev_device_update_db(dev);
udev_device_update_db(dev);
- err = udev_node_add(dev, event->mode, event->uid, event->gid, event->test);
/* remove/update possible left-over symlinks from old database entry */
if (dev_old != NULL) {
/* 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);
}
udev_device_unref(dev_old);
}
+
+ /* create new node and symlinks */
+ err = udev_node_add(dev, event->mode, event->uid, event->gid);
goto exit;
}
goto exit;
}
@@
-678,7
+673,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
goto exit;
}
goto exit;
}
- err = udev_node_remove(dev
, event->test
);
+ err = udev_node_remove(dev);
goto exit;
}
goto exit;
}