summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/load-dropin.c71
-rw-r--r--src/core/load-dropin.h10
-rw-r--r--src/shared/dropin.c11
-rw-r--r--src/shared/dropin.h26
-rw-r--r--src/systemctl/systemctl.c3
5 files changed, 75 insertions, 46 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index fc07151d37..0511fb38ef 100644
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -22,50 +22,71 @@
#include "load-dropin.h"
#include "load-fragment.h"
#include "log.h"
+#include "stat-util.h"
#include "strv.h"
#include "unit-name.h"
#include "unit.h"
-static int add_dependency_consumer(
- UnitDependency dependency,
- const char *entry,
- const char* filepath,
- void *arg) {
- Unit *u = arg;
+static int process_deps(Unit *u, UnitDependency dependency, const char *dir_suffix) {
+ _cleanup_strv_free_ char **paths = NULL;
+ char **p;
int r;
- assert(u);
-
- r = unit_add_dependency_by_name(u, dependency, entry, filepath, true);
+ 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)
- log_error_errno(r, "Cannot add dependency %s to %s, ignoring: %m", entry, u->id);
+ return r;
+
+ STRV_FOREACH(p, paths) {
+ const char *entry;
+
+ entry = basename(*p);
+
+ 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;
+ }
+
+ /* TODO: add more checks on the symlink name and target here */
+
+ r = unit_add_dependency_by_name(u, dependency, entry, *p, true);
+ if (r < 0)
+ 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) {
_cleanup_strv_free_ char **l = NULL;
- Iterator i;
- char *t, **f;
+ 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.search_path) {
- unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t,
- ".wants", UNIT_WANTS,
- add_dependency_consumer, u, NULL);
- unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t,
- ".requires", UNIT_REQUIRES,
- add_dependency_consumer, u, NULL);
- }
- }
+ r = process_deps(u, UNIT_REQUIRES, ".requires");
+ if (r < 0)
+ return r;
+ /* Load .conf dropins */
r = unit_find_dropin_paths(u, &l);
if (r <= 0)
return 0;
diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h
index 319827dfb9..5828a223ce 100644
--- a/src/core/load-dropin.h
+++ b/src/core/load-dropin.h
@@ -25,11 +25,11 @@
/* Read service data supplementary drop-in directories */
static inline int unit_find_dropin_paths(Unit *u, char ***paths) {
- return unit_file_find_dropin_paths(NULL,
- u->manager->lookup_paths.search_path,
- u->manager->unit_path_cache,
- u->names,
- paths);
+ return unit_file_find_dropin_conf_paths(NULL,
+ u->manager->lookup_paths.search_path,
+ u->manager->unit_path_cache,
+ u->names,
+ paths);
}
int unit_load_dropin(Unit *u);
diff --git a/src/shared/dropin.c b/src/shared/dropin.c
index 06cf3de620..3944ccec44 100644
--- a/src/shared/dropin.c
+++ b/src/shared/dropin.c
@@ -173,7 +173,7 @@ static int iterate_dir(
return 0;
}
-int unit_file_process_dir(
+static int unit_file_process_dir(
const char *original_root,
Set *unit_path_cache,
const char *unit_path,
@@ -221,6 +221,8 @@ int unit_file_find_dropin_paths(
const char *original_root,
char **lookup_path,
Set *unit_path_cache,
+ const char *dir_suffix,
+ const char *file_suffix,
Set *names,
char ***paths) {
@@ -235,16 +237,17 @@ int unit_file_find_dropin_paths(
char **p;
STRV_FOREACH(p, lookup_path)
- unit_file_process_dir(original_root, unit_path_cache, *p, t, ".d",
+ unit_file_process_dir(original_root, unit_path_cache,
+ *p, t, dir_suffix,
_UNIT_DEPENDENCY_INVALID, NULL, NULL, &strv);
}
if (strv_isempty(strv))
return 0;
- r = conf_files_list_strv(&ans, ".conf", NULL, (const char**) strv);
+ r = conf_files_list_strv(&ans, file_suffix, NULL, (const char**) strv);
if (r < 0)
- return log_warning_errno(r, "Failed to get list of configuration files: %m");
+ return log_warning_errno(r, "Failed to sort the list of configuration files: %m");
*paths = ans;
ans = NULL;
diff --git a/src/shared/dropin.h b/src/shared/dropin.h
index 761b250886..22cd2fa229 100644
--- a/src/shared/dropin.h
+++ b/src/shared/dropin.h
@@ -44,20 +44,24 @@ typedef int (*dependency_consumer_t)(UnitDependency dependency,
const char* filepath,
void *arg);
-int unit_file_process_dir(
- const char *original_root,
- Set * unit_path_cache,
- const char *unit_path,
- const char *name,
- const char *suffix,
- UnitDependency dependency,
- dependency_consumer_t consumer,
- void *arg,
- char ***strv);
-
int unit_file_find_dropin_paths(
const char *original_root,
char **lookup_path,
Set *unit_path_cache,
+ const char *dir_suffix,
+ const char *file_suffix,
Set *names,
char ***paths);
+
+static inline int unit_file_find_dropin_conf_paths(
+ const char *original_root,
+ char **lookup_path,
+ Set *unit_path_cache,
+ Set *names,
+ char ***paths) {
+ return unit_file_find_dropin_paths(original_root,
+ lookup_path,
+ unit_path_cache,
+ ".d", ".conf",
+ names, paths);
+}
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 2964b4e6b2..5cb07739d4 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2601,7 +2601,8 @@ static int unit_find_paths(
return log_error_errno(r, "Failed to add unit name: %m");
if (dropin_paths) {
- r = unit_file_find_dropin_paths(arg_root, lp->search_path, NULL, names, &dropins);
+ r = unit_file_find_dropin_conf_paths(arg_root, lp->search_path,
+ NULL, names, &dropins);
if (r < 0)
return r;
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-06-01 22:36:00 +0000