Revert "sd_path_lookup*() add new type SD_PATH_SEARCH_SYSCTL"

diff --git a/man/sd_path_lookup.xml b/man/sd_path_lookup.xml
index 8fe04ae8af84681f554b535010387ee4f1172591..fc6bac640c9fcd17c7e1c1402151f09f6b860e50 100644 (file)
--- a/man/sd_path_lookup.xml
+++ b/man/sd_path_lookup.xml
@@ -76,7 +76,6 @@
         <constant>SD_PATH_SEARCH_CONFIGURATION_FACTORY</constant>,
         <constant>SD_PATH_SEARCH_STATE_FACTORY</constant>,
         <constant>SD_PATH_SEARCH_CONFIGURATION</constant>,
-        <constant>SD_PATH_SEARCH_SYSCTL</constant>,
 
         <constant>SD_PATH_SYSTEMD_UTIL</constant>,
         <constant>SD_PATH_SYSTEMD_SYSTEM_UNIT</constant>,

diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index e3877fff4a99f6406a34b7ddd54f8a3ed50f5b90..0096997135357a6e55f0453cde88ae535e713151 100644 (file)
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -683,11 +683,7 @@ static int get_search(uint64_t type, char ***ret) {
 
                 *ret = TAKE_PTR(l);
                 return 0;
-        }
-
-        case SD_PATH_SEARCH_SYSCTL:
-                return strv_from_nulstr(ret, CONF_PATHS_NULSTR("sysctl.d"));
-        }
+        }}
 
         return -EOPNOTSUPP;
 }

diff --git a/src/path/path-tool.c b/src/path/path-tool.c
index 92dbd3496b0fa1264ed7a1dcecd6fb32143f9d2d..3dc31832b38cba9ed31b8755981ad5ab53b285d9 100644 (file)
--- a/src/path/path-tool.c
+++ b/src/path/path-tool.c
@@ -66,7 +66,6 @@ static const char* const path_table[_SD_PATH_MAX] = {
         [SD_PATH_SEARCH_CONFIGURATION_FACTORY]                = "search-configuration-factory",
         [SD_PATH_SEARCH_STATE_FACTORY]                        = "search-state-factory",
         [SD_PATH_SEARCH_CONFIGURATION]                        = "search-configuration",
-        [SD_PATH_SEARCH_SYSCTL]                               = "search-sysctl",
 
         [SD_PATH_SYSTEMD_UTIL]                                = "systemd-util",
 

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index e90d6c37992bc32a864466ef12ca4e1f284a78fc..d761c7375a20f70898258e20f7ce33db0b6565a0 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -4,8 +4,6 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "sd-path.h"
-
 #include "alloc-util.h"
 #include "build.h"
 #include "conf-files.h"
@@ -281,10 +279,10 @@ static int parse_line(const char *fname, unsigned line, const char *buffer, bool
         return 0;
 }
 
-static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ignore_enoent, const char **search_paths) {
+static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ignore_enoent) {
         return conf_file_read(
                         /* root = */ NULL,
-                        search_paths,
+                        (const char**) CONF_PATHS_STRV("sysctl.d"),
                         path,
                         parse_line,
                         sysctl_options,
@@ -307,7 +305,7 @@ static int read_credential_lines(OrderedHashmap **sysctl_options) {
         if (!j)
                 return log_oom();
 
-        return parse_file(sysctl_options, j, /* ignore_enoent= */ true, /* search_paths= */ NULL);
+        return parse_file(sysctl_options, j, /* ignore_enoent= */ true);
 }
 
 static int cat_config(char **files) {
@@ -442,13 +440,8 @@ static int parse_argv(int argc, char *argv[]) {
 
 static int run(int argc, char *argv[]) {
         _cleanup_ordered_hashmap_free_ OrderedHashmap *sysctl_options = NULL;
-        _cleanup_strv_free_ char **search_paths = NULL;
         int r;
 
-        r = sd_path_lookup_strv(SD_PATH_SEARCH_SYSCTL, /* suffix= */ NULL, &search_paths);
-        if (r < 0)
-               return log_error_errno(r, "Failed to get sysctl.d/ search paths: %m");
-
         r = parse_argv(argc, argv);
         if (r <= 0)
                 return r;
@@ -465,12 +458,12 @@ static int run(int argc, char *argv[]) {
                                 /* Use (argument):n, where n==1 for the first positional arg */
                                 RET_GATHER(r, parse_line("(argument)", ++pos, *arg, /* invalid_config = */ NULL, &sysctl_options));
                         else
-                                RET_GATHER(r, parse_file(&sysctl_options, *arg, /* ignore_enoent= */ false, (const char**) search_paths));
+                                RET_GATHER(r, parse_file(&sysctl_options, *arg, false));
                 }
         } else {
                 _cleanup_strv_free_ char **files = NULL;
 
-                r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) search_paths);
+                r = conf_files_list_strv(&files, ".conf", NULL, 0, (const char**) CONF_PATHS_STRV("sysctl.d"));
                 if (r < 0)
                         return log_error_errno(r, "Failed to enumerate sysctl.d files: %m");
 
@@ -478,7 +471,7 @@ static int run(int argc, char *argv[]) {
                         return cat_config(files);
 
                 STRV_FOREACH(f, files)
-                        RET_GATHER(r, parse_file(&sysctl_options, *f, /* ignore_enoent= */ true, /* search_paths= */ NULL));
+                        RET_GATHER(r, parse_file(&sysctl_options, *f, true));
 
                 RET_GATHER(r, read_credential_lines(&sysctl_options));
         }

diff --git a/src/systemd/sd-path.h b/src/systemd/sd-path.h
index 3199996011aa058a1b443f0b330bc6a9d1b12bf5..eb42e31a689ccf39bf6ed17ce16982d16cb29b8a 100644 (file)
--- a/src/systemd/sd-path.h
+++ b/src/systemd/sd-path.h
@@ -129,8 +129,6 @@ __extension__ enum {
         SD_PATH_USER_CREDENTIAL_STORE_ENCRYPTED,
         SD_PATH_USER_SEARCH_CREDENTIAL_STORE_ENCRYPTED,
 
-        SD_PATH_SEARCH_SYSCTL,
-
         _SD_PATH_MAX,
         _SD_PATH_INVALID = UINT64_MAX
 };