#include "log.h"
#include "strv.h"
#include "unit-name.h"
-
-static int iterate_dir(Unit *u, const char *path, UnitDependency dependency) {
- DIR *d;
- struct dirent *de;
+#include "conf-parser.h"
+#include "load-fragment.h"
+#include "conf-files.h"
+
+static int add_dependency_consumer(
+ UnitDependency dependency,
+ const char *entry,
+ const char* filepath,
+ void *arg) {
+ Unit *u = arg;
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);
-
- 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;
-}
-
-static int process_dir(Unit *u, const char *unit_path, const char *name, const char *suffix, UnitDependency dependency) {
- 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_add_dependency_by_name(u, dependency, entry, filepath, true);
if (r < 0)
- return r;
-
- if (u->instance) {
- char *template;
- /* Also try the template dir */
-
- template = unit_name_template(name);
- if (!template)
- return -ENOMEM;
-
- path = strjoin(unit_path, "/", template, suffix, NULL);
- free(template);
-
- 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);
-
- if (r < 0)
- return r;
- }
+ log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", entry, u->id);
return 0;
}
int unit_load_dropin(Unit *u) {
Iterator i;
- char *t;
+ char *t, **f;
+ int r;
assert(u);
char **p;
STRV_FOREACH(p, u->manager->lookup_paths.unit_path) {
- int r;
+ unit_file_process_dir(u->manager->unit_path_cache, *p, t, ".wants", UNIT_WANTS,
+ add_dependency_consumer, u, NULL);
+ unit_file_process_dir(u->manager->unit_path_cache, *p, t, ".requires", UNIT_REQUIRES,
+ add_dependency_consumer, u, NULL);
+ }
+ }
- r = process_dir(u, *p, t, ".wants", UNIT_WANTS);
- if (r < 0)
- return r;
+ r = unit_find_dropin_paths(u, &u->dropin_paths);
+ if (r <= 0)
+ 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;
}