chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udevadm: monitor - use epoll
[elogind.git]
/
udev
/
udev-event.c
diff --git
a/udev/udev-event.c
b/udev/udev-event.c
index 100a79c1e84e1435b0c11fa8e29dbcc44f86217d..60d06aa084900e2a3c10dc3127bf76fd59dfa59f 100644
(file)
--- a/
udev/udev-event.c
+++ b/
udev/udev-event.c
@@
-454,7
+454,7
@@
static void rename_netif_kernel_log(struct ifreq ifr)
return;
}
return;
}
- fprintf(f, "<
6
>udev[%u]: renamed network interface %s to %s\n",
+ fprintf(f, "<
30
>udev[%u]: renamed network interface %s to %s\n",
getpid(), ifr.ifr_name, ifr.ifr_newname);
fclose(f);
}
getpid(), ifr.ifr_name, ifr.ifr_newname);
fclose(f);
}
@@
-539,7
+539,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
return -1;
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
return -1;
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
- udev_device_read_db(dev);
+ udev_device_read_db(dev
, NULL
);
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
udev_device_delete_db(dev);
udev_device_tag_index(dev, NULL, false);
@@
-553,7
+553,7
@@
int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
} else {
event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (event->dev_db != NULL) {
} else {
event->dev_db = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
if (event->dev_db != NULL) {
- udev_device_read_db(event->dev_db);
+ udev_device_read_db(event->dev_db
, NULL
);
udev_device_set_info_loaded(event->dev_db);
/* disable watch during event processing */
udev_device_set_info_loaded(event->dev_db);
/* disable watch during event processing */
@@
-688,7
+688,7
@@
int udev_event_execute_run(struct udev_event *event, const sigset_t *sigmask)
info(event->udev, "delay execution of '%s'\n", program);
sleep(event->exec_delay);
}
info(event->udev, "delay execution of '%s'\n", program);
sleep(event->exec_delay);
}
- if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask
, true
) != 0) {
+ if (util_run_program(event->udev, program, envp, NULL, 0, NULL, sigmask) != 0) {
if (udev_list_entry_get_flags(list_entry))
err = -1;
}
if (udev_list_entry_get_flags(list_entry))
err = -1;
}