X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.c;h=7d0b351c9d14de68c978e486bcea151cbf6498cd;hb=83cc030fadf71d63d488cf9015275f9e5a02e2cc;hp=4a8408212a645cb2c33e6ee38989c439de5108b6;hpb=0658666bacde7decbc362f0f589fe6aa5251faba;p=elogind.git

diff --git a/src/manager.c b/src/manager.c
index 4a8408212..7d0b351c9 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -461,7 +461,6 @@ void manager_free(Manager *m) {
 #endif
 
         free(m->notify_socket);
-        free(m->console);
 
         lookup_paths_free(&m->lookup_paths);
         strv_free(m->environment);
@@ -2783,22 +2782,6 @@ void manager_reset_failed(Manager *m) {
                 unit_reset_failed(u);
 }
 
-int manager_set_console(Manager *m, const char *console) {
-        char *c;
-
-        assert(m);
-
-        if (!(c = strdup(console)))
-                return -ENOMEM;
-
-        free(m->console);
-        m->console = c;
-
-        log_debug("Using kernel console %s", c);
-
-        return 0;
-}
-
 bool manager_unit_pending_inactive(Manager *m, const char *name) {
         Unit *u;
 
@@ -2853,9 +2836,8 @@ void manager_check_finished(Manager *m) {
 
 void manager_run_generators(Manager *m) {
         DIR *d = NULL;
-        struct dirent *de;
-        Hashmap *pids = NULL;
         const char *generator_path;
+        const char *argv[3];
 
         assert(m);
 
@@ -2885,83 +2867,11 @@ void manager_run_generators(Manager *m) {
                 }
         }
 
-        if (!(pids = hashmap_new(trivial_hash_func, trivial_compare_func))) {
-                log_error("Failed to allocate set.");
-                goto finish;
-        }
-
-        while ((de = readdir(d))) {
-                char *path;
-                pid_t pid;
-                int k;
-
-                if (ignore_file(de->d_name))
-                        continue;
-
-                if (de->d_type != DT_REG &&
-                    de->d_type != DT_LNK &&
-                    de->d_type != DT_UNKNOWN)
-                        continue;
-
-                if (asprintf(&path, "%s/%s", generator_path, de->d_name) < 0) {
-                        log_error("Out of memory");
-                        continue;
-                }
-
-                if ((pid = fork()) < 0) {
-                        log_error("Failed to fork: %m");
-                        free(path);
-                        continue;
-                }
-
-                if (pid == 0) {
-                        const char *arguments[5];
-                        /* Child */
+        argv[0] = NULL; /* Leave this empty, execute_directory() will fill something in */
+        argv[1] = m->generator_unit_path;
+        argv[2] = NULL;
 
-                        arguments[0] = path;
-                        arguments[1] = m->generator_unit_path;
-                        arguments[2] = NULL;
-
-                        execv(path, (char **) arguments);
-
-                        log_error("Failed to execute %s: %m", path);
-                        _exit(EXIT_FAILURE);
-                }
-
-                log_debug("Spawned generator %s as %lu", path, (unsigned long) pid);
-
-                if ((k = hashmap_put(pids, UINT_TO_PTR(pid), path)) < 0) {
-                        log_error("Failed to add PID to set: %s", strerror(-k));
-                        free(path);
-                }
-        }
-
-        while (!hashmap_isempty(pids)) {
-                siginfo_t si;
-                char *path;
-
-                zero(si);
-                if (waitid(P_ALL, 0, &si, WEXITED) < 0) {
-
-                        if (errno == EINTR)
-                                continue;
-
-                        log_error("waitid() failed: %m");
-                        goto finish;
-                }
-
-                if ((path = hashmap_remove(pids, UINT_TO_PTR(si.si_pid)))) {
-                        if (!is_clean_exit(si.si_code, si.si_status)) {
-                                if (si.si_code == CLD_EXITED)
-                                        log_error("%s exited with exit status %i.", path, si.si_status);
-                                else
-                                        log_error("%s terminated by signal %s.", path, signal_to_string(si.si_status));
-                        } else
-                                log_debug("Generator %s exited successfully.", path);
-
-                        free(path);
-                }
-        }
+        execute_directory(generator_path, d, (char**) argv);
 
         if (rmdir(m->generator_unit_path) >= 0) {
                 /* Uh? we were able to remove this dir? I guess that
@@ -2990,9 +2900,6 @@ void manager_run_generators(Manager *m) {
 finish:
         if (d)
                 closedir(d);
-
-        if (pids)
-                hashmap_free_free(pids);
 }
 
 void manager_undo_generators(Manager *m) {