act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
+ /* reset to default */
+ act.sa_handler = SIG_DFL;
+ sigaction(SIGINT, &act, NULL);
+ sigaction(SIGTERM, &act, NULL);
+ sigaction(SIGCHLD, &act, NULL);
+ sigaction(SIGHUP, &act, NULL);
+
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
retval = udev_device_event(&rules, udev);
/* run programs collected by RUN-key*/
- if (retval == 0) {
+ if (retval == 0 && !udev->ignore_device && udev_run) {
struct name_entry *name_loop;
+ dbg("executing run list");
list_for_each_entry(name_loop, &udev->run_list, node) {
if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
- pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
- else
- if (run_program(name_loop->name, udev->dev->subsystem, NULL, 0, NULL,
+ pass_env_to_socket(&name_loop->name[strlen("socket:")], udev->dev->devpath, udev->action);
+ else {
+ char program[PATH_SIZE];
+
+ strlcpy(program, name_loop->name, sizeof(program));
+ udev_rules_apply_format(udev, program, sizeof(program));
+ if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
(udev_log_priority >= LOG_INFO)))
retval = -1;
+ }
}
}
if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
return;
+ list_for_each_entry(loop_msg, &exec_list, node)
+ if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+ return;
+
/* move failed events to the failed directory */
if (state == EVENT_FAILED) {
create_path(filename_failed);
/* child */
close(uevent_netlink_sock);
close(udevd_sock);
- if (inotify_fd > 0)
+ if (inotify_fd >= 0)
close(inotify_fd);
close(signal_pipe[READ_END]);
close(signal_pipe[WRITE_END]);
static void msg_queue_insert(struct uevent_msg *msg)
{
+ char filename[PATH_SIZE];
+ int fd;
+
msg->queue_time = time(NULL);
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+ fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+ if (fd >= 0) {
+ char str[32];
+ int len;
+
+ len = sprintf(str, "%llu\n", msg->seqnum);
+ write(fd, str, len);
+ close(fd);
+ }
+
export_event_state(msg, EVENT_QUEUED);
/* run all events with a timeout set immediately */
msg->envp[i++] = "UDEVD_EVENT=1";
msg->envp[i] = NULL;
- if (!msg->devpath) {
- info("DEVPATH missing, ignore message");
+ if (msg->devpath == NULL || msg->action == NULL) {
+ info("DEVPATH or ACTION missing, ignore message");
free(msg);
return NULL;
}
-
return msg;
}
switch (usend_msg.type) {
case UDEVD_UEVENT_UDEVSEND:
- case UDEVD_UEVENT_INITSEND:
info("udevd event message received");
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
dbg("envbuf_size=%i", envbuf_size);
struct uevent_msg *msg;
int bufpos;
ssize_t size;
- static char buffer[UEVENT_BUFFER_SIZE + 512];
+ static char buffer[UEVENT_BUFFER_SIZE+512];
char *pos;
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
return 0;
}
+static void export_initial_seqnum(void)
+{
+ char filename[PATH_SIZE];
+ int fd;
+ char seqnum[32];
+ ssize_t len = 0;
+
+ strlcpy(filename, sysfs_path, sizeof(filename));
+ strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+ fd = open(filename, O_RDONLY);
+ if (fd >= 0) {
+ len = read(fd, seqnum, sizeof(seqnum)-1);
+ close(fd);
+ }
+ if (len <= 0) {
+ strcpy(seqnum, "0\n");
+ len = 3;
+ }
+ strlcpy(filename, udev_root, sizeof(filename));
+ strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+ create_path(filename);
+ fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+ if (fd >= 0) {
+ write(fd, seqnum, len);
+ close(fd);
+ }
+}
+
int main(int argc, char *argv[], char *envp[])
{
int retval;
sysfs_init();
udev_rules_init(&rules, 1);
+ export_initial_seqnum();
+
if (daemonize) {
pid_t pid;
err("error getting pipes: %s", strerror(errno));
goto exit;
}
- retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
+
+ retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
if (retval < 0) {
err("error fcntl on read pipe: %s", strerror(errno));
goto exit;
}
- retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
+
+ retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
if (retval < 0) {
err("error fcntl on write pipe: %s", strerror(errno));
goto exit;
/* watch rules directory */
inotify_fd = inotify_init();
- if (inotify_fd > 0)
+ if (inotify_fd >= 0)
inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ else if (errno == ENOSYS)
+ err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+ else
+ err("inotify_init failed: %s", strerror(errno));
/* maximum limit of forked childs */
value = getenv("UDEVD_MAX_CHILDS");
FD_SET(signal_pipe[READ_END], &readfds);
FD_SET(udevd_sock, &readfds);
FD_SET(uevent_netlink_sock, &readfds);
- if (inotify_fd > 0)
+ if (inotify_fd >= 0)
FD_SET(inotify_fd, &readfds);
fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
}
/* rules directory inotify watch */
- if ((inotify_fd > 0) && FD_ISSET(inotify_fd, &readfds)) {
+ if ((inotify_fd >= 0) && FD_ISSET(inotify_fd, &readfds)) {
int nbytes;
/* discard all possible events, we can just reload the config */
udev_rules_cleanup(&rules);
sysfs_cleanup();
- if (signal_pipe[READ_END] > 0)
+ if (signal_pipe[READ_END] >= 0)
close(signal_pipe[READ_END]);
- if (signal_pipe[WRITE_END] > 0)
+ if (signal_pipe[WRITE_END] >= 0)
close(signal_pipe[WRITE_END]);
- if (udevd_sock > 0)
+ if (udevd_sock >= 0)
close(udevd_sock);
- if (inotify_fd > 0)
+ if (inotify_fd >= 0)
close(inotify_fd);
- if (uevent_netlink_sock > 0)
+ if (uevent_netlink_sock >= 0)
close(uevent_netlink_sock);
logging_close();
~ianmdlvl / elogind.git / blobdiff