struct udev_event *udev_event_new(struct udev_device *dev)
{
+ struct udev *udev = udev_device_get_udev(dev);
struct udev_event *event;
event = calloc(1, sizeof(struct udev_event));
if (event == NULL)
return NULL;
- event->mode = 0600;
event->dev = dev;
- event->udev = udev_device_get_udev(dev);
- udev_list_init(&event->run_list);
+ event->udev = udev;
+ udev_list_init(udev, &event->run_list, false);
event->fd_signal = -1;
event->birth_usec = now_usec();
- event->timeout_usec = 120 * 1000 * 1000;
+ event->timeout_usec = 60 * 1000 * 1000;
dbg(event->udev, "allocated event %p\n", event);
return event;
}
{
if (event == NULL)
return;
- udev_list_cleanup_entries(event->udev, &event->run_list);
+ udev_list_cleanup(&event->run_list);
free(event->tmp_node);
free(event->program_result);
free(event->name);
len = strlen(vbuf);
while (len > 0 && isspace(vbuf[--len]))
vbuf[len] = '\0';
- count = udev_util_replace_chars(vbuf, UDEV_ALLOWED_CHARS_INPUT);
+ count = util_replace_chars(vbuf, UDEV_ALLOWED_CHARS_INPUT);
if (count > 0)
info(event->udev, "%i character(s) replaced\n" , count);
l = util_strpcpy(&s, l, vbuf);
/* exec failed */
err = -errno;
- err(udev, "exec of program '%s' failed\n", cmd);
+ err(udev, "failed to execute '%s' '%s': %m\n", argv[0], cmd);
return err;
}
-static int spawn_read(struct udev_event *event,
+static void spawn_read(struct udev_event *event,
const char *cmd,
int fd_stdout, int fd_stderr,
char *result, size_t ressize)
size_t respos = 0;
int fd_ep = -1;
struct epoll_event ep_outpipe, ep_errpipe;
- int err = 0;
/* read from child if requested */
if (fd_stdout < 0 && fd_stderr < 0)
- return 0;
+ return;
fd_ep = epoll_create1(EPOLL_CLOEXEC);
if (fd_ep < 0) {
- err = -errno;
err(udev, "error creating epoll fd: %m\n");
goto out;
}
age_usec = now_usec() - event->birth_usec;
if (age_usec >= event->timeout_usec) {
- err = -ETIMEDOUT;
err(udev, "timeout '%s'\n", cmd);
goto out;
}
if (fdcount < 0) {
if (errno == EINTR)
continue;
- err = -errno;
err(udev, "failed to poll: %m\n");
goto out;
}
if (fdcount == 0) {
- err = -ETIMEDOUT;
err(udev, "timeout '%s'\n", cmd);
goto out;
}
respos += count;
} else {
err(udev, "'%s' ressize %zd too short\n", cmd, ressize);
- err = -ENOBUFS;
}
}
}
} else if (ev[i].events & EPOLLHUP) {
if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, *fd, NULL) < 0) {
- err = -errno;
err(udev, "failed to remove fd from epoll: %m\n");
goto out;
}
out:
if (fd_ep >= 0)
close(fd_ep);
- return err;
}
static int spawn_wait(struct udev_event *event, const char *cmd, pid_t pid)
}
}
- /* allow programs in /lib/udev/ to be called without the path */
+ /* allow programs in /usr/lib/udev/ to be called without the path */
if (argv[0][0] != '/') {
util_strscpyl(program, sizeof(program), LIBEXECDIR "/", argv[0], NULL);
argv[0] = program;
errpipe[WRITE_END] = -1;
}
- err = spawn_read(event, cmd,
- outpipe[READ_END], errpipe[READ_END],
- result, ressize);
+ spawn_read(event, cmd,
+ outpipe[READ_END], errpipe[READ_END],
+ result, ressize);
err = spawn_wait(event, cmd, pid);
}
if (err == 0) {
info(event->udev, "renamed netif to '%s'\n", event->name);
- /* delete stale db file */
- udev_device_delete_db(dev);
- udev_device_tag_index(dev, NULL, false);
-
/* remember old name */
udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
if (event->dev_db != NULL)
udev_node_update_old_links(dev, event->dev_db);
- /* change default 0600 to 0660 if a group is assigned */
- if (event->mode == 0600 && event->gid > 0)
- event->mode = 0660;
+ if (!event->mode_set) {
+ if (udev_device_get_devnode_mode(dev) > 0) {
+ /* kernel supplied value */
+ event->mode = udev_device_get_devnode_mode(dev);
+ } else if (event->gid > 0) {
+ /* default 0660 if a group is assigned */
+ event->mode = 0660;
+ } else {
+ /* default 0600 */
+ event->mode = 0600;
+ }
+ }
+
+ /* set sticky bit, so we do not remove the node on module unload */
+ if (event->static_node)
+ event->mode |= 01000;
err = udev_node_add(dev, event->mode, event->uid, event->gid);
}
/* preserve old, or get new initialization timestamp */
if (event->dev_db != NULL && udev_device_get_usec_initialized(event->dev_db) > 0)
udev_device_set_usec_initialized(event->dev, udev_device_get_usec_initialized(event->dev_db));
- else
+ else if (udev_device_get_usec_initialized(event->dev) == 0)
udev_device_set_usec_initialized(event->dev, now_usec());
/* (re)write database file */
udev_event_apply_format(event, cmd, program, sizeof(program));
envp = udev_device_get_properties_envp(event->dev);
if (udev_event_spawn(event, program, envp, sigmask, NULL, 0) < 0) {
- if (udev_list_entry_get_flags(list_entry))
+ if (udev_list_entry_get_num(list_entry))
err = -1;
}
}