udev_list_node_remove(&event->node);
/* mark as failed, if "add" event returns non-zero */
- if (event->exitcode != 0 && strcmp(udev_device_get_action(event->dev), "add") == 0)
+ if (event->exitcode != 0 && strcmp(udev_device_get_action(event->dev), "remove") != 0)
udev_queue_export_device_failed(udev_queue_export, event->dev);
else
udev_queue_export_device_finished(udev_queue_export, event->dev);
if (udev_device_get_event_timeout(dev) >= 0)
alarm(udev_device_get_event_timeout(dev));
- /* execute RUN= */
- if (err == 0 && !udev_event->ignore_device && udev_get_run(udev_event->udev))
- failed = udev_event_execute_run(udev_event,
- &orig_sigmask);
+ if (err == 0)
+ failed = udev_event_execute_run(udev_event, &orig_sigmask);
- /* reset alarm */
alarm(0);
/* apply/restore inotify watch */
/* send processed event back to libudev listeners */
udev_monitor_send_device(worker_monitor, NULL, dev);
- /* send back the result of the event execution */
+ /* send udevd the result of the event execution */
if (err != 0)
msg.exitcode = err;
else if (failed != 0)
}
}
-static void event_run(struct event *event)
+static void event_run(struct event *event, bool force)
{
struct udev_list_node *loop;
return;
}
- if (childs >= max_childs) {
+ if (!force && childs >= max_childs) {
info(event->udev, "maximum number (%i) of childs reached\n", childs);
return;
}
/* run all events with a timeout set immediately */
if (udev_device_get_timeout(dev) > 0) {
- worker_new(event);
+ event_run(event, true);
return;
}
}
continue;
}
- event_run(event);
+ event_run(event, false);
}
}
}
}
-static void startup_log(struct udev *udev)
-{
- FILE *f;
- char path[UTIL_PATH_SIZE];
- struct stat statbuf;
-
- f = fopen("/dev/kmsg", "w");
- if (f != NULL)
- fprintf(f, "<6>udev: starting version " VERSION "\n");
-
- util_strscpyl(path, sizeof(path), udev_get_sys_path(udev), "/class/mem/null", NULL);
- if (lstat(path, &statbuf) == 0 && S_ISDIR(statbuf.st_mode)) {
- const char *depr_str =
- "udev: missing sysfs features; please update the kernel "
- "or disable the kernel's CONFIG_SYSFS_DEPRECATED option; "
- "udev may fail to work correctly";
-
- if (f != NULL)
- fprintf(f, "<3>%s\n", depr_str);
- err(udev, "%s\n", depr_str);
- sleep(15);
- }
-
- if (f != NULL)
- fclose(f);
-}
-
int main(int argc, char *argv[])
{
struct udev *udev;
int fd;
+ FILE *f;
sigset_t mask;
const char *value;
int daemonize = false;
if (udev_get_rules_path(udev) != NULL) {
inotify_add_watch(pfd[FD_INOTIFY].fd, udev_get_rules_path(udev),
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
} else {
char filename[UTIL_PATH_SIZE];
+ struct stat statbuf;
inotify_add_watch(pfd[FD_INOTIFY].fd, LIBEXECDIR "/rules.d",
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
inotify_add_watch(pfd[FD_INOTIFY].fd, SYSCONFDIR "/udev/rules.d",
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
/* watch dynamic rules directory */
util_strscpyl(filename, sizeof(filename), udev_get_dev_path(udev), "/.udev/rules.d", NULL);
+ if (stat(filename, &statbuf) != 0) {
+ util_create_path(udev, filename);
+ udev_selinux_setfscreatecon(udev, filename, S_IFDIR|0755);
+ mkdir(filename, 0755);
+ udev_selinux_resetfscreatecon(udev);
+ }
inotify_add_watch(pfd[FD_INOTIFY].fd, filename,
- IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
}
udev_watch_restore(udev);
}
}
- startup_log(udev);
+ f = fopen("/dev/kmsg", "w");
+ if (f != NULL) {
+ fprintf(f, "<6>udev: starting version " VERSION "\n");
+ fclose(f);
+ }
/* redirect std{out,err} */
if (!debug && !debug_trace) {