X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsysctl.c;h=9f7acfce8b09f76d67247c0d82caa2c35baed5aa;hp=38ea2d18bc2a48bcc85b17e17d547c58c7061bf0;hb=9b7115360516f2b6ec1eef1523157ff528878880;hpb=5707631ec6ef3b5731825f3fd52ccbecbf12c073 diff --git a/src/sysctl.c b/src/sysctl.c index 38ea2d18b..9f7acfce8 100644 --- a/src/sysctl.c +++ b/src/sysctl.c @@ -23,26 +23,29 @@ #include #include #include -#include #include #include +#include #include "log.h" +#include "strv.h" #include "util.h" +#include "strv.h" #define PROC_SYS_PREFIX "/proc/sys/" -static int exit_code = 0; +static char **arg_prefixes = NULL; -static void apply_sysctl(const char *property, const char *value) { +static int apply_sysctl(const char *property, const char *value) { char *p, *n; - int r; + int r = 0, k; log_debug("Setting '%s' to '%s'", property, value); - if (!(p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property)))) { + p = new(char, sizeof(PROC_SYS_PREFIX) + strlen(property)); + if (!p) { log_error("Out of memory"); - exit_code = -ENOMEM; + return -ENOMEM; } n = stpcpy(p, PROC_SYS_PREFIX); @@ -52,38 +55,63 @@ static void apply_sysctl(const char *property, const char *value) { if (*n == '.') *n = '/'; - if ((r = write_one_line_file(p, value)) < 0) { + if (!strv_isempty(arg_prefixes)) { + char **i; + bool good = false; - log_full(r == -ENOENT ? LOG_DEBUG : LOG_WARNING, - "Failed to write '%s' to '%s': %s", value, p, strerror(-r)); + STRV_FOREACH(i, arg_prefixes) + if (path_startswith(p, *i)) { + good = true; + break; + } + + if (!good) { + log_debug("Skipping %s", p); + free(p); + return 0; + } + } + + k = write_one_line_file(p, value); + if (k < 0) { - if (r != -ENOENT) - exit_code = r; + log_full(k == -ENOENT ? LOG_DEBUG : LOG_WARNING, + "Failed to write '%s' to '%s': %s", value, p, strerror(-k)); + + if (k != -ENOENT && r == 0) + r = k; } free(p); + + return r; } -static void apply_file(const char *path) { +static int apply_file(const char *path, bool ignore_enoent) { FILE *f; + int r = 0; assert(path); if (!(f = fopen(path, "re"))) { + if (ignore_enoent && errno == ENOENT) + return 0; + log_error("Failed to open file '%s', ignoring: %m", path); - exit_code = -errno; - return; + return -errno; } + log_debug("apply: %s\n", path); while (!feof(f)) { char l[LINE_MAX], *p, *value; + int k; if (!fgets(l, sizeof(l), f)) { if (feof(f)) break; log_error("Failed to read file '%s', ignoring: %m", path); - exit_code = -errno; + r = -errno; goto finish; } @@ -97,42 +125,101 @@ static void apply_file(const char *path) { if (!(value = strchr(p, '='))) { log_error("Line is not an assignment in file '%s': %s", path, value); - exit_code = -EINVAL; + + if (r == 0) + r = -EINVAL; continue; } *value = 0; value++; - apply_sysctl(strstrip(p), strstrip(value)); + if ((k = apply_sysctl(strstrip(p), strstrip(value))) < 0 && r == 0) + r = k; } finish: fclose(f); + + return r; } -static int nftw_cb( - const char *fpath, - const struct stat *sb, - int tflag, - struct FTW *ftwbuf) { +static int help(void) { - if (tflag != FTW_F) - return 0; + printf("%s [OPTIONS...] [CONFIGURATION FILE...]\n\n" + "Applies kernel sysctl settings.\n\n" + " -h --help Show this help\n" + " --prefix=PATH Only apply rules that apply to paths with the specified prefix\n", + program_invocation_short_name); - if (ignore_file(fpath + ftwbuf->base)) - return 0; + return 0; +} - if (!endswith(fpath, ".conf")) - return 0; +static int parse_argv(int argc, char *argv[]) { - apply_file(fpath); - return 0; -}; + enum { + ARG_PREFIX + }; + + static const struct option options[] = { + { "help", no_argument, NULL, 'h' }, + { "prefix", required_argument, NULL, ARG_PREFIX }, + { NULL, 0, NULL, 0 } + }; + + int c; + + assert(argc >= 0); + assert(argv); + + while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) { + + switch (c) { + + case 'h': + help(); + return 0; + + case ARG_PREFIX: { + char *p; + char **l; + + for (p = optarg; *p; p++) + if (*p == '.') + *p = '/'; + + l = strv_append(arg_prefixes, optarg); + if (!l) { + log_error("Out of memory"); + return -ENOMEM; + } + + strv_free(arg_prefixes); + arg_prefixes = l; + + break; + } + + case '?': + return -EINVAL; + + default: + log_error("Unknown option code %c", c); + return -EINVAL; + } + } + + return 1; +} int main(int argc, char *argv[]) { + int r = 0; + + r = parse_argv(argc, argv); + if (r <= 0) + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; - if (argc > 2) { + if (argc-optind > 1) { log_error("This program expects one or no arguments."); return EXIT_FAILURE; } @@ -141,12 +228,37 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); - if (argc > 1) - nftw(argv[1], nftw_cb, 64, FTW_MOUNT|FTW_PHYS); + if (argc > optind) + r = apply_file(argv[optind], false); else { - nftw("/etc/sysctl.conf", nftw_cb, 64, FTW_MOUNT|FTW_PHYS); - nftw("/etc/sysctl.d", nftw_cb, 64, FTW_MOUNT|FTW_PHYS); + char **files, **f; + + r = conf_files_list(&files, ".conf", + "/run/sysctl.d", + "/etc/sysctl.d", + "/usr/local/lib/sysctl.d", + "/usr/lib/sysctl.d", + "/lib/sysctl.d", + NULL); + if (r < 0) { + log_error("Failed to enumerate sysctl.d files: %s", strerror(-r)); + goto finish; + } + + STRV_FOREACH(f, files) { + int k; + + k = apply_file(*f, true); + if (k < 0 && r == 0) + r = k; + } + + apply_file("/etc/sysctl.conf", true); + + strv_free(files); } +finish: + strv_free(arg_prefixes); - return exit_code < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; }