]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - src/core/load-dropin.c
conf-parser: turn three bool function params into a flags fields
[thirdparty/systemd.git] / src / core / load-dropin.c
index 86f81c7484ea6674c4661f2252130800fe5c0d26..c98ab4164f588a60c7ee2d4083f4d04e59195520 100644 (file)
@@ -1,5 +1,3 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
 /***
   This file is part of systemd.
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <dirent.h>
-#include <errno.h>
 
-#include "unit.h"
+#include "conf-parser.h"
+#include "fs-util.h"
 #include "load-dropin.h"
+#include "load-fragment.h"
 #include "log.h"
+#include "stat-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "unit-name.h"
+#include "unit.h"
 
-static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
-        DIR *d;
-        struct dirent *de;
+static int unit_name_compatible(const char *a, const char *b) {
+        _cleanup_free_ char *prefix = NULL;
         int r;
 
-        assert(u);
-        assert(path);
-
-        d = opendir(path);
-        if (!d) {
-
-                if (errno == ENOENT)
-                        return 0;
-
-                return -errno;
-        }
-
-        while ((de = readdir(d))) {
-                char *f;
-
-                if (ignore_file(de->d_name))
-                        continue;
-
-                f = strjoin(path, "/", de->d_name, NULL);
-                if (!f) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-
-                r = unit_add_dependency_by_name(u, dependency, de->d_name, f, true);
-                free(f);
+        /* the straightforward case: the symlink name matches the target */
+        if (streq(a, b))
+                return 1;
 
-                if (r < 0)
-                        log_error("Cannot add dependency %s to %s, ignoring: %s", de->d_name, u->id, strerror(-r));
-        }
+        r = unit_name_template(a, &prefix);
+        if (r == -EINVAL)
+                /* not a template */
+                return 0;
+        if (r < 0)
+                /* oom, or some other failure. Just skip the warning. */
+                return r;
 
-        r = 0;
+        /* an instance name points to a target that is just the template name */
+        if (streq(prefix, b))
+                return 1;
 
-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) {
+static int process_deps(Unit *u, UnitDependency dependency, const char *dir_suffix) {
+        _cleanup_strv_free_ char **paths = NULL;
+        char **p;
         int r;
-        char *path;
-
-        assert(u);
-        assert(unit_path);
-        assert(name);
-        assert(suffix);
-
-        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);
 
+        r = unit_file_find_dropin_paths(NULL,
+                                        u->manager->lookup_paths.search_path,
+                                        u->manager->unit_path_cache,
+                                        dir_suffix,
+                                        NULL,
+                                        u->names,
+                                        &paths);
         if (r < 0)
                 return r;
 
-        if (u->instance) {
-                char *template;
-                /* Also try the template dir */
+        STRV_FOREACH(p, paths) {
+                const char *entry;
+                _cleanup_free_ char *target = NULL;
 
-                template = unit_name_template(name);
-                if (!template)
-                        return -ENOMEM;
+                entry = basename(*p);
 
-                path = strjoin(unit_path, "/", template, suffix, NULL);
-                free(template);
+                if (null_or_empty_path(*p) > 0) {
+                        /* an error usually means an invalid symlink, which is not a mask */
+                        log_unit_debug(u, "%s dependency on %s is masked by %s, ignoring.",
+                                       unit_dependency_to_string(dependency), entry, *p);
+                        continue;
+                }
+
+                r = is_symlink(*p);
+                if (r < 0) {
+                        log_unit_warning_errno(u, r, "%s dropin %s unreadable, ignoring: %m",
+                                               unit_dependency_to_string(dependency), *p);
+                        continue;
+                }
+                if (r == 0) {
+                        log_unit_warning(u, "%s dependency dropin %s is not a symlink, ignoring.",
+                                         unit_dependency_to_string(dependency), *p);
+                        continue;
+                }
 
-                if (!path)
-                        return -ENOMEM;
+                if (!unit_name_is_valid(entry, UNIT_NAME_ANY)) {
+                        log_unit_warning(u, "%s dependency dropin %s is not a valid unit name, ignoring.",
+                                         unit_dependency_to_string(dependency), *p);
+                        continue;
+                }
 
-                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);
+                r = readlink_malloc(*p, &target);
+                if (r < 0) {
+                        log_unit_warning_errno(u, r, "readlink(\"%s\") failed, ignoring: %m", *p);
+                        continue;
+                }
 
+                /* We don't treat this as an error, especially because we didn't check this for a
+                 * long time. Nevertheless, we warn, because such mismatch can be mighty confusing. */
+                r = unit_name_compatible(entry, basename(target));
+                if (r < 0) {
+                        log_unit_warning_errno(u, r, "Can't check if names %s and %s are compatible, ignoring: %m", entry, basename(target));
+                        continue;
+                }
+                if (r == 0)
+                        log_unit_warning(u, "%s dependency dropin %s target %s has different name",
+                                         unit_dependency_to_string(dependency), *p, target);
+
+                r = unit_add_dependency_by_name(u, dependency, entry, *p, true, UNIT_DEPENDENCY_FILE);
                 if (r < 0)
-                        return r;
+                        log_unit_error_errno(u, r, "cannot add %s dependency on %s, ignoring: %m",
+                                             unit_dependency_to_string(dependency), entry);
         }
 
         return 0;
 }
 
 int unit_load_dropin(Unit *u) {
-        Iterator i;
-        char *t;
+        _cleanup_strv_free_ char **l = NULL;
+        char **f;
+        int r;
 
         assert(u);
 
-        /* Load dependencies from supplementary drop-in directories */
-
-        SET_FOREACH(t, u->names, i) {
-                char **p;
+        /* Load dependencies from .wants and .requires directories */
+        r = process_deps(u, UNIT_WANTS, ".wants");
+        if (r < 0)
+                return r;
 
-                STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
-                        int r;
+        r = process_deps(u, UNIT_REQUIRES, ".requires");
+        if (r < 0)
+                return r;
 
-                        r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
-                        if (r < 0)
-                                return r;
+        /* Load .conf dropins */
+        r = unit_find_dropin_paths(u, &l);
+        if (r <= 0)
+                return 0;
 
-                        r = process_dir(u, *p, t, ".requires", UNIT_REQUIRES);
-                        if (r < 0)
-                                return r;
-                }
+        if (!u->dropin_paths) {
+                u->dropin_paths = l;
+                l = NULL;
+        } else {
+                r = strv_extend_strv(&u->dropin_paths, l, true);
+                if (r < 0)
+                        return log_oom();
         }
 
+        STRV_FOREACH(f, u->dropin_paths)
+                (void) config_parse(u->id, *f, NULL,
+                                    UNIT_VTABLE(u)->sections,
+                                    config_item_perf_lookup, load_fragment_gperf_lookup,
+                                    0, u);
+
+        u->dropin_mtime = now(CLOCK_REALTIME);
+
         return 0;
 }