chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
088 release
[elogind.git]
/
udevd.c
diff --git
a/udevd.c
b/udevd.c
index c45d3a4cd0513b4d00f5bed18882bf4ef595cbea..701165b9ad0df601ecb53dcf53480843634ae0f9 100644
(file)
--- a/
udevd.c
+++ b/
udevd.c
@@
-100,6
+100,13
@@
static int udev_event_process(struct uevent_msg *msg)
act.sa_flags = 0;
sigaction(SIGALRM, &act, NULL);
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);
/* trigger timeout to prevent hanging processes */
alarm(UDEV_ALARM_TIMEOUT);
@@
-117,16
+124,22
@@
static int udev_event_process(struct uevent_msg *msg)
retval = udev_device_event(&rules, udev);
/* run programs collected by RUN-key*/
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;
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);
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,
+ 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;
(udev_log_priority >= LOG_INFO)))
retval = -1;
+ }
}
}
}
}
@@
-194,6
+207,10
@@
static void export_event_state(struct uevent_msg *msg, enum event_state state)
if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
return;
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);
/* move failed events to the failed directory */
if (state == EVENT_FAILED) {
create_path(filename_failed);
@@
-521,7
+538,6
@@
static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
free(msg);
return NULL;
}
free(msg);
return NULL;
}
-
return msg;
}
return msg;
}
@@
-575,7
+591,6
@@
static struct uevent_msg *get_udevd_msg(void)
switch (usend_msg.type) {
case UDEVD_UEVENT_UDEVSEND:
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);
info("udevd event message received");
envbuf_size = size - offsetof(struct udevd_msg, envbuf);
dbg("envbuf_size=%i", envbuf_size);
@@
-621,7
+636,7
@@
static struct uevent_msg *get_netlink_msg(void)
struct uevent_msg *msg;
int bufpos;
ssize_t 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);
char *pos;
size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);
@@
-906,12
+921,24
@@
int main(int argc, char *argv[], char *envp[])
err("error getting pipes: %s", strerror(errno));
goto exit;
}
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;
}
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;
if (retval < 0) {
err("error fcntl on write pipe: %s", strerror(errno));
goto exit;