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=3023cdae60a08f2ec66a3352a92678fdde62af65;hb=0571e0111d76cf96aa4069d9c7a6e24d97aa7e48;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662

diff --git a/load-dropin.c b/load-dropin.c
index 3023cdae6..a3c9d3c77 100644
--- a/load-dropin.c
+++ b/load-dropin.c
@@ -1,11 +1,92 @@
 /*-*- 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 <http://www.gnu.org/licenses/>.
+***/
+
+#include <dirent.h>
+#include <errno.h>
+
+#include "unit.h"
 #include "load-dropin.h"
+#include "log.h"
+#include "strv.h"
 
 int unit_load_dropin(Unit *u) {
+        Iterator i;
+        int r;
+        char *t;
+
         assert(u);
 
         /* Load dependencies from supplementary drop-in directories */
 
+        SET_FOREACH(t, u->meta.names, i) {
+                char *path;
+                DIR *d;
+                struct dirent *de;
+                char **p;
+
+                STRV_FOREACH(p, u->meta.manager->unit_path) {
+
+                        if (asprintf(&path, "%s/%s.wants", *p, t) < 0)
+                                return -ENOMEM;
+
+                        if (!(d = opendir(path))) {
+                                r = -errno;
+                                free(path);
+
+                                if (r == -ENOENT)
+                                        continue;
+
+                                return r;
+                        }
+
+                        free(path);
+
+                        while ((de = readdir(d))) {
+
+                                if (ignore_file(de->d_name))
+                                        continue;
+
+                                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;
+                                }
+
+                                r = unit_add_dependency_by_name(u, UNIT_WANTS, path);
+                                free(path);
+
+                                if (r < 0) {
+                                        closedir(d);
+                                        return r;
+                                }
+                        }
+
+                        closedir(d);
+                }
+        }
+
         return 0;
 }