X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-dropin.c;h=a3c9d3c77dde42b5eb859494eff1bd7880220ad6;hp=521eb0821aea9c84128003b3bb4444f20c18e4ca;hb=0571e0111d76cf96aa4069d9c7a6e24d97aa7e48;hpb=b19e7dc0104c8839835a90d7df20c2eeb631e07e
diff --git a/load-dropin.c b/load-dropin.c
index 521eb0821..a3c9d3c77 100644
--- a/load-dropin.c
+++ b/load-dropin.c
@@ -1,11 +1,31 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
#include "unit.h"
#include "load-dropin.h"
#include "log.h"
+#include "strv.h"
int unit_load_dropin(Unit *u) {
Iterator i;
@@ -20,52 +40,52 @@ int unit_load_dropin(Unit *u) {
char *path;
DIR *d;
struct dirent *de;
+ char **p;
- if (asprintf(&path, "%s/%s.wants", unit_path(), t) < 0)
- return -ENOMEM;
+ STRV_FOREACH(p, u->meta.manager->unit_path) {
- if (!(d = opendir(path))) {
- r = -errno;
- free(path);
+ if (asprintf(&path, "%s/%s.wants", *p, t) < 0)
+ return -ENOMEM;
- if (r == -ENOENT)
- continue;
+ if (!(d = opendir(path))) {
+ r = -errno;
+ free(path);
- return r;
- }
+ if (r == -ENOENT)
+ continue;
- free(path);
+ return r;
+ }
- while ((de = readdir(d))) {
- if (de->d_name[0] == '.')
- continue;
+ free(path);
- assert(de->d_name[0]);
+ while ((de = readdir(d))) {
- if (de->d_name[strlen(de->d_name)-1] == '~')
- continue;
+ if (ignore_file(de->d_name))
+ continue;
- if (asprintf(&path, "%s/%s.wants/%s", unit_path(), t, de->d_name) < 0) {
- closedir(d);
- return -ENOMEM;
- }
+ if (asprintf(&path, "%s/%s.wants/%s", *p, t, de->d_name) < 0) {
+ closedir(d);
+ return -ENOMEM;
+ }
- if (!unit_name_is_valid(de->d_name)) {
- log_info("Name of %s is not a valid unit name. Ignoring.", path);
- free(path);
- continue;
- }
+ if (!unit_name_is_valid(de->d_name)) {
+ log_info("Name of %s is not a valid unit name. Ignoring.", path);
+ free(path);
+ continue;
+ }
- r = unit_add_dependency_by_name(u, UNIT_WANTS, path);
- free(path);
+ r = unit_add_dependency_by_name(u, UNIT_WANTS, path);
+ free(path);
- if (r < 0) {
- closedir(d);
- return r;
+ if (r < 0) {
+ closedir(d);
+ return r;
+ }
}
- }
- closedir(d);
+ closedir(d);
+ }
}
return 0;