X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fload-dropin.c;h=ffc68b4d737fdaa269e1e5f7ea05ea25184b7b95;hp=4323147a01ce62517de1018ee22b5195894c2272;hb=e66047ff62c971eefa32b42373420d61e3f2a9c1;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 4323147a0..ffc68b4d7 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -27,104 +27,145 @@
 #include "log.h"
 #include "strv.h"
 #include "unit-name.h"
+#include "conf-parser.h"
+#include "load-fragment.h"
+#include "conf-files.h"
 
-static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
-        DIR *d;
-        struct dirent *de;
+static int iterate_dir(
+                Unit *u,
+                const char *path,
+                UnitDependency dependency,
+                char ***strv) {
+
+        _cleanup_closedir_ DIR *d = NULL;
         int r;
 
         assert(u);
         assert(path);
 
+        /* The config directories are special, since the order of the
+         * drop-ins matters */
+        if (dependency < 0)  {
+                r = strv_extend(strv, path);
+                if (r < 0)
+                        return log_oom();
+
+                return 0;
+        }
+
         d = opendir(path);
         if (!d) {
-
                 if (errno == ENOENT)
                         return 0;
 
+                log_error("Failed to open directory %s: %m", path);
                 return -errno;
         }
 
-        while ((de = readdir(d))) {
-                char *f;
+        for (;;) {
+                struct dirent *de;
+                _cleanup_free_ char *f = NULL;
+                int k;
+
+                errno = 0;
+                de = readdir(d);
+                if (!de && errno != 0) {
+                        k = errno;
+                        log_error("Failed to read directory %s: %s", path, strerror(k));
+                        return -k;
+                }
+
+                if (!de)
+                        break;
 
                 if (ignore_file(de->d_name))
                         continue;
 
-                f = join(path, "/", de->d_name, NULL);
-                if (!f) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
+                f = strjoin(path, "/", de->d_name, NULL);
+                if (!f)
+                        return log_oom();
 
                 r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
-                free(f);
-
                 if (r < 0)
                         log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
         }
 
-        r = 0;
-
-finish:
-        closedir(d);
-        return r;
+        return 0;
 }
 
-static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency) {
-        int r;
-        char *path;
+static int process_dir(
+                Unit *u,
+                const char *unit_path,
+                const char *name,
+                const char *suffix,
+                UnitDependency dependency,
+                char ***strv) {
+
+        _cleanup_free_ char *path = NULL;
 
         assert(u);
         assert(unit_path);
         assert(name);
         assert(suffix);
 
-        path = join(unit_path, "/", name, suffix, NULL);
+        path = strjoin(unit_path, "/", name, suffix, NULL);
         if (!path)
-                return -ENOMEM;
-
-        if (u->manager->unit_path_cache &&
-            !set_get(u->manager->unit_path_cache, path))
-                r = 0;
-        else
-                r = iterate_dir(u, path, dependency);
-        free(path);
+                return log_oom();
 
-        if (r < 0)
-                return r;
+        if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, path))
+                iterate_dir(u, path, dependency, strv);
 
         if (u->instance) {
-                char *template;
+                _cleanup_free_ char *template = NULL, *p = NULL;
                 /* Also try the template dir */
 
                 template = unit_name_template(name);
                 if (!template)
-                        return -ENOMEM;
+                        return log_oom();
 
-                path = join(unit_path, "/", template, suffix, NULL);
-                free(template);
+                p = strjoin(unit_path, "/", template, suffix, NULL);
+                if (!p)
+                        return log_oom();
 
-                if (!path)
-                        return -ENOMEM;
+                if (!u->manager->unit_path_cache || set_get(u->manager->unit_path_cache, p))
+                        iterate_dir(u, p, dependency, strv);
+        }
 
-                if (u->manager->unit_path_cache &&
-                    !set_get(u->manager->unit_path_cache, path))
-                        r = 0;
-                else
-                        r = iterate_dir(u, path, dependency);
-                free(path);
+        return 0;
+}
 
-                if (r < 0)
-                        return r;
+char **unit_find_dropin_paths(Unit *u) {
+        _cleanup_strv_free_ char **strv = NULL;
+        char **configs = NULL;
+        Iterator i;
+        char *t;
+        int r;
+
+        assert(u);
+
+        SET_FOREACH(t, u->names, i) {
+                char **p;
+
+                STRV_FOREACH(p, u->manager->lookup_paths.unit_path)
+                        process_dir(u, *p, t, ".d", _UNIT_DEPENDENCY_INVALID, &strv);
         }
 
-        return 0;
+        if (strv_isempty(strv))
+                return NULL;
+
+        r = conf_files_list_strv(&configs, ".conf", NULL, (const char**) strv);
+        if (r < 0) {
+                log_error("Failed to get list of configuration files: %s", strerror(-r));
+                strv_free(configs);
+                return NULL;
+        }
+
+        return configs;
 }
 
 int unit_load_dropin(Unit *u) {
         Iterator i;
-        char *t;
+        char *t, **f;
 
         assert(u);
 
@@ -134,17 +175,23 @@ int unit_load_dropin(Unit *u) {
                 char **p;
 
                 STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
-                        int r;
+                        process_dir(u, *p, t, ".wants", UNIT_WANTS, NULL);
+                        process_dir(u, *p, t, ".requires", UNIT_REQUIRES, NULL);
+                }
+        }
 
-                        r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
-                        if (r < 0)
-                                return r;
+        u->dropin_paths = unit_find_dropin_paths(u);
+        if (!u->dropin_paths)
+                return 0;
 
-                        r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES);
-                        if (r < 0)
-                                return r;
-                }
+        STRV_FOREACH(f, u->dropin_paths) {
+                config_parse(u->id, *f, NULL,
+                             UNIT_VTABLE(u)->sections,
+                             config_item_perf_lookup, load_fragment_gperf_lookup,
+                             false, false, false, u);
         }
 
+        u->dropin_mtime = now(CLOCK_REALTIME);
+
         return 0;
 }