chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not import the "uevent" file when we only read the db to get old symlinks
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index e297df03834a62c94ae29cca47208bf1c0a51c53..fe579b49c7f7065d4b1c9a827e785468a3e973eb 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-295,13
+295,17
@@
found:
size_t size;
value[0] = '\0';
size_t size;
value[0] = '\0';
+ /* read the value specified by [usb/]*/
util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
util_resolve_subsys_kernel(event->udev, attr, value, sizeof(value), 1);
- val = udev_device_get_sysattr_value(event->dev, attr);
- if (val != NULL)
- util_strlcpy(value, val, sizeof(value));
+ /* try to read attribute of the current device */
+ if (value[0] == '\0') {
+ val = udev_device_get_sysattr_value(event->dev, attr);
+ if (val != NULL)
+ util_strlcpy(value, val, sizeof(value));
+ }
- /* try t
he current device, other matches may
have selected */
+ /* try t
o read the attribute of the parent device, other matches
have selected */
if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
val = udev_device_get_sysattr_value(event->dev_parent, attr);
if (val != NULL)
if (value[0] == '\0' && event->dev_parent != NULL && event->dev_parent != event->dev) {
val = udev_device_get_sysattr_value(event->dev_parent, attr);
if (val != NULL)
@@
-392,8
+396,8
@@
found:
{
struct udev_list_entry *list_entry;
{
struct udev_list_entry *list_entry;
- list_entry = udev_device_get_
propertie
s_list_entry(dev);
- util_strlc
py
(string, udev_list_entry_get_name(list_entry), maxsize);
+ list_entry = udev_device_get_
devlink
s_list_entry(dev);
+ util_strlc
at
(string, udev_list_entry_get_name(list_entry), maxsize);
udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
util_strlcat(string, " ", maxsize);
util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
udev_list_entry_foreach(list_entry, udev_list_entry_get_next(list_entry)) {
util_strlcat(string, " ", maxsize);
util_strlcat(string, udev_list_entry_get_name(list_entry), maxsize);
@@
-579,23
+583,22
@@
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
; cleanup, if it is known device
*/
+ /* read current database entry */
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (dev_old != NULL) {
- if (udev_device_get_devnode(dev_old) != NULL) {
- info(event->udev, "device node '%s' already in database, updating\n",
- udev_device_get_devnode(dev_old));
- udev_node_update_old_links(dev, dev_old, event->test);
- }
- udev_device_unref(dev_old);
+ udev_device_read_db(dev_old);
+ udev_device_set_info_loaded(dev_old);
}
}
+ /* update database, create node and symlinks */
udev_device_update_db(dev);
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, event->test);
- if (err != 0)
- goto exit;
+ /* 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_device_unref(dev_old);
+ }
goto exit;
}
goto exit;
}
@@
-642,8
+645,8
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
/* import database entry and delete it */
udev_device_read_db(dev);
if (major(udev_device_get_devnum(dev)) != 0 && strcmp(udev_device_get_action(dev), "remove") == 0) {
/* import database entry and delete it */
udev_device_read_db(dev);
- if (!event->test)
-
udev_device_delete_db(dev);
+ udev_device_set_info_loaded(dev);
+ udev_device_delete_db(dev);
if (udev_device_get_devnode(dev) == NULL) {
char devnode[UTIL_PATH_SIZE];
if (udev_device_get_devnode(dev) == NULL) {
char devnode[UTIL_PATH_SIZE];
@@
-702,6
+705,11
@@
int udev_event_execute_run(struct udev_event *event)
util_strlcpy(program, cmd, sizeof(program));
udev_event_apply_format(event, program, sizeof(program));
util_strlcpy(program, cmd, sizeof(program));
udev_event_apply_format(event, program, sizeof(program));
+ if (event->trace)
+ fprintf(stderr, "run %s (%llu) '%s'\n",
+ udev_device_get_syspath(event->dev),
+ udev_device_get_seqnum(event->dev),
+ program);
envp = udev_device_get_properties_envp(event->dev);
if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
if (!udev_list_entry_get_flag(list_entry))
envp = udev_device_get_properties_envp(event->dev);
if (util_run_program(event->udev, program, envp, NULL, 0, NULL) != 0) {
if (!udev_list_entry_get_flag(list_entry))