X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=e8b36029869317a3dc2a7ac3bcd5bfc532c33f12;hb=37d522746b67fda0d52111364d81358ce560bcf7;hp=8cdcbd8fb078841b74b731eefc3f75bafd4ea083;hpb=bba7a48439e63defa20641b140522eac55fc1a1e;p=elogind.git diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 8cdcbd8fb..e8b360298 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1058,7 +1058,6 @@ static int parse_argv(int argc, char *argv[]) { } else if (streq(optarg, "never")) { arg_resolve_names = -1; } else { - fprintf(stderr, "resolve-names must be early, late or never\n"); log_error("resolve-names must be early, late or never"); return 0; } @@ -1086,7 +1085,11 @@ int main(int argc, char *argv[]) { int fd_ctrl = -1; int fd_netlink = -1; int fd_worker = -1; - struct epoll_event ep_ctrl, ep_inotify, ep_signal, ep_netlink, ep_worker; + struct epoll_event ep_ctrl = { .events = EPOLLIN }; + struct epoll_event ep_inotify = { .events = EPOLLIN }; + struct epoll_event ep_signal = { .events = EPOLLIN }; + struct epoll_event ep_netlink = { .events = EPOLLIN }; + struct epoll_event ep_worker = { .events = EPOLLIN }; struct udev_ctrl_connection *ctrl_conn = NULL; int rc = 1, r; @@ -1101,9 +1104,6 @@ int main(int argc, char *argv[]) { udev_set_log_fn(udev, udev_main_log); log_set_max_level(udev_get_log_priority(udev)); - log_debug("version %s", VERSION); - label_init("/dev"); - r = parse_argv(argc, argv); if (r <= 0) goto exit; @@ -1116,11 +1116,12 @@ int main(int argc, char *argv[]) { } if (getuid() != 0) { - fprintf(stderr, "root privileges required\n"); log_error("root privileges required"); goto exit; } + label_init("/dev"); + /* set umask before creating any file/directory */ chdir("/"); umask(022); @@ -1142,7 +1143,6 @@ int main(int argc, char *argv[]) { if (fd > STDERR_FILENO) close(fd); } else { - fprintf(stderr, "cannot open /dev/null\n"); log_error("cannot open /dev/null"); } } @@ -1170,7 +1170,6 @@ int main(int argc, char *argv[]) { /* open control and netlink socket */ udev_ctrl = udev_ctrl_new(udev); if (udev_ctrl == NULL) { - fprintf(stderr, "error initializing udev control socket"); log_error("error initializing udev control socket"); rc = 1; goto exit; @@ -1179,7 +1178,6 @@ int main(int argc, char *argv[]) { monitor = udev_monitor_new_from_netlink(udev, "kernel"); if (monitor == NULL) { - fprintf(stderr, "error initializing netlink socket\n"); log_error("error initializing netlink socket"); rc = 3; goto exit; @@ -1188,14 +1186,12 @@ int main(int argc, char *argv[]) { } if (udev_monitor_enable_receiving(monitor) < 0) { - fprintf(stderr, "error binding netlink socket\n"); log_error("error binding netlink socket"); rc = 3; goto exit; } if (udev_ctrl_enable_receiving(udev_ctrl) < 0) { - fprintf(stderr, "error binding udev control socket\n"); log_error("error binding udev control socket"); rc = 1; goto exit; @@ -1203,6 +1199,20 @@ int main(int argc, char *argv[]) { udev_monitor_set_receive_buffer_size(monitor, 128 * 1024 * 1024); + log_info("starting version " VERSION "\n"); + + udev_builtin_init(udev); + + rules = udev_rules_new(udev, arg_resolve_names); + if (rules == NULL) { + log_error("error reading rules"); + goto exit; + } + + rc = udev_rules_apply_static_dev_perms(rules); + if (rc < 0) + log_error("failed to apply permissions on static device nodes - %s", strerror(-rc)); + if (arg_daemonize) { pid_t pid; @@ -1226,23 +1236,22 @@ int main(int argc, char *argv[]) { sd_notify(1, "READY=1"); } - log_info("starting version " VERSION "\n"); + if (arg_children_max <= 0) { + cpu_set_t cpu_set; - if (!arg_debug) { - int fd; + arg_children_max = 8; - fd = open("/dev/null", O_RDWR); - if (fd >= 0) { - dup2(fd, STDIN_FILENO); - dup2(fd, STDOUT_FILENO); - dup2(fd, STDERR_FILENO); - close(fd); + if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { + arg_children_max += CPU_COUNT(&cpu_set) * 2; } } + log_debug("set children_max to %u", arg_children_max); + + udev_list_node_init(&event_list); + udev_list_node_init(&worker_list); fd_inotify = udev_watch_init(udev); if (fd_inotify < 0) { - fprintf(stderr, "error initializing inotify\n"); log_error("error initializing inotify"); rc = 4; goto exit; @@ -1254,7 +1263,6 @@ int main(int argc, char *argv[]) { sigprocmask(SIG_SETMASK, &mask, &sigmask_orig); fd_signal = signalfd(-1, &mask, SFD_NONBLOCK|SFD_CLOEXEC); if (fd_signal < 0) { - fprintf(stderr, "error creating signalfd\n"); log_error("error creating signalfd"); rc = 5; goto exit; @@ -1262,39 +1270,16 @@ int main(int argc, char *argv[]) { /* unnamed socket from workers to the main daemon */ if (socketpair(AF_LOCAL, SOCK_DGRAM|SOCK_CLOEXEC, 0, worker_watch) < 0) { - fprintf(stderr, "error creating socketpair\n"); log_error("error creating socketpair"); rc = 6; goto exit; } fd_worker = worker_watch[READ_END]; - udev_builtin_init(udev); - - rules = udev_rules_new(udev, arg_resolve_names); - if (rules == NULL) { - log_error("error reading rules"); - goto exit; - } - - memzero(&ep_ctrl, sizeof(struct epoll_event)); - ep_ctrl.events = EPOLLIN; ep_ctrl.data.fd = fd_ctrl; - - memzero(&ep_inotify, sizeof(struct epoll_event)); - ep_inotify.events = EPOLLIN; ep_inotify.data.fd = fd_inotify; - - memzero(&ep_signal, sizeof(struct epoll_event)); - ep_signal.events = EPOLLIN; ep_signal.data.fd = fd_signal; - - memzero(&ep_netlink, sizeof(struct epoll_event)); - ep_netlink.events = EPOLLIN; ep_netlink.data.fd = fd_netlink; - - memzero(&ep_worker, sizeof(struct epoll_event)); - ep_worker.events = EPOLLIN; ep_worker.data.fd = fd_worker; fd_ep = epoll_create1(EPOLL_CLOEXEC); @@ -1311,24 +1296,6 @@ int main(int argc, char *argv[]) { goto exit; } - if (arg_children_max <= 0) { - cpu_set_t cpu_set; - - arg_children_max = 8; - - if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) { - arg_children_max += CPU_COUNT(&cpu_set) * 2; - } - } - log_debug("set children_max to %u", arg_children_max); - - rc = udev_rules_apply_static_dev_perms(rules); - if (rc < 0) - log_error("failed to apply permissions on static device nodes - %s", strerror(-rc)); - - udev_list_node_init(&event_list); - udev_list_node_init(&worker_list); - for (;;) { static usec_t last_usec; struct epoll_event ev[8];