X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmanager.c;h=a71150d0a93e46ec4695d3afbc3a540beb2c0d6b;hb=a4ddf82766c41627bd94c609bb55983f4b81814f;hp=f6f205fac8aefc6383516b4530ee0cd7f7bd82fd;hpb=a4312405f209ff19fa071b15bda843f4e68ffbbc;p=elogind.git diff --git a/src/manager.c b/src/manager.c index f6f205fac..a71150d0a 100644 --- a/src/manager.c +++ b/src/manager.c @@ -163,6 +163,16 @@ static char** session_dirs(void) { } else if (home) { if (asprintf(&data_home, "%s/.local/share/systemd/session", home) < 0) goto fail; + + /* There is really no need for two unit dirs in $HOME, + * except to be fully compliant with the XDG spec. We + * now try to link the two dirs, so that we can + * minimize disk seeks a little. Further down we'll + * then filter out this link, if it is actually is + * one. */ + + mkdir_parents(data_home, 0777); + symlink("../../../.config/systemd/session", data_home); } if ((e = getenv("XDG_DATA_DIRS"))) @@ -283,15 +293,33 @@ static int manager_find_paths(Manager *m) { } } + if (m->unit_path) + if (!strv_path_canonicalize(m->unit_path)) + return -ENOMEM; + + if (m->sysvinit_path) + if (!strv_path_canonicalize(m->sysvinit_path)) + return -ENOMEM; + + if (m->sysvrcnd_path) + if (!strv_path_canonicalize(m->sysvrcnd_path)) + return -ENOMEM; + strv_uniq(m->unit_path); strv_uniq(m->sysvinit_path); strv_uniq(m->sysvrcnd_path); - assert(!strv_isempty(m->unit_path)); - if (!(t = strv_join(m->unit_path, "\n\t"))) - return -ENOMEM; - log_debug("Looking for unit files in:\n\t%s", t); - free(t); + if (!strv_isempty(m->unit_path)) { + + if (!(t = strv_join(m->unit_path, "\n\t"))) + return -ENOMEM; + log_debug("Looking for unit files in:\n\t%s", t); + free(t); + } else { + log_debug("Ignoring unit files."); + strv_free(m->unit_path); + m->unit_path = NULL; + } if (!strv_isempty(m->sysvinit_path)) { @@ -300,8 +328,11 @@ static int manager_find_paths(Manager *m) { log_debug("Looking for SysV init scripts in:\n\t%s", t); free(t); - } else + } else { log_debug("Ignoring SysV init scripts."); + strv_free(m->sysvinit_path); + m->sysvinit_path = NULL; + } if (!strv_isempty(m->sysvrcnd_path)) { @@ -310,8 +341,11 @@ static int manager_find_paths(Manager *m) { log_debug("Looking for SysV rcN.d links in:\n\t%s", t); free(t); - } else + } else { log_debug("Ignoring SysV rcN.d links."); + strv_free(m->sysvrcnd_path); + m->sysvrcnd_path = NULL; + } return 0; } @@ -327,7 +361,7 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if (!(m = new0(Manager, 1))) return -ENOMEM; - m->boot_timestamp = now(CLOCK_REALTIME); + timestamp_get(&m->startup_timestamp); m->running_as = running_as; m->confirm_spawn = confirm_spawn; @@ -930,20 +964,25 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned /* Does a recursive sweep through the ordering graph, looking * for a cycle. If we find cycle we try to break it. */ - /* Did we find a cycle? */ - if (j->marker && j->generation == generation) { + /* Have we seen this before? */ + if (j->generation == generation) { Job *k; - /* So, we already have been here. We have a - * cycle. Let's try to break it. We go backwards in - * our path and try to find a suitable job to - * remove. We use the marker to find our way back, - * since smart how we are we stored our way back in - * there. */ + /* If the marker is NULL we have been here already and + * decided the job was loop-free from here. Hence + * shortcut things and return right-away. */ + if (!j->marker) + return 0; + /* So, the marker is not NULL and we already have been + * here. We have a cycle. Let's try to break it. We go + * backwards in our path and try to find a suitable + * job to remove. We use the marker to find our way + * back, since smart how we are we stored our way back + * in there. */ log_debug("Found ordering cycle on %s/%s", j->unit->meta.id, job_type_to_string(j->type)); - for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) { + for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) { log_debug("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type)); @@ -968,8 +1007,10 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned } /* Make the marker point to where we come from, so that we can - * find our way backwards if we want to break a cycle */ - j->marker = from; + * find our way backwards if we want to break a cycle. We use + * a special marker for the beginning: we point to + * ourselves. */ + j->marker = from ? from : j; j->generation = generation; /* We assume that the the dependencies are bidirectional, and @@ -1001,6 +1042,7 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { Job *j; int r; Iterator i; + unsigned g; assert(m); assert(generation); @@ -1008,8 +1050,10 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { /* Check if the ordering graph is cyclic. If it is, try to fix * that up by dropping one of the jobs. */ + g = (*generation)++; + HASHMAP_FOREACH(j, m->transaction_jobs, i) - if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0) + if ((r = transaction_verify_order_one(m, j, NULL, g)) < 0) return r; return 0; @@ -1757,11 +1801,13 @@ static int manager_dispatch_sigchld(Manager *m) { return 0; } -static void manager_start_target(Manager *m, const char *name) { +static int manager_start_target(Manager *m, const char *name) { int r; if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_REPLACE, true, NULL)) < 0) log_error("Failed to enqueue %s job: %s", name, strerror(-r)); + + return r; } static int manager_process_signal_fd(Manager *m) { @@ -1790,14 +1836,14 @@ static int manager_process_signal_fd(Manager *m) { break; case SIGTERM: - if (m->running_as == MANAGER_INIT) + if (m->running_as == MANAGER_INIT) { /* This is for compatibility with the * original sysvinit */ m->exit_code = MANAGER_REEXECUTE; - else - m->exit_code = MANAGER_EXIT; + break; + } - return 0; + /* Fall through */ case SIGINT: if (m->running_as == MANAGER_INIT) { @@ -1805,8 +1851,13 @@ static int manager_process_signal_fd(Manager *m) { break; } - m->exit_code = MANAGER_EXIT; - return 0; + /* Run the exit target if there is one, if not, just exit. */ + if (manager_start_target(m, SPECIAL_EXIT_SERVICE) < 0) { + m->exit_code = MANAGER_EXIT; + return 0; + } + + break; case SIGWINCH: if (m->running_as == MANAGER_INIT) @@ -2067,7 +2118,7 @@ void manager_write_utmp_reboot(Manager *m) { if (!manager_utmp_good(m)) return; - if ((r = utmp_put_reboot(m->boot_timestamp)) < 0) { + if ((r = utmp_put_reboot(m->startup_timestamp.realtime)) < 0) { if (r != -ENOENT && r != -EROFS) log_warning("Failed to write utmp/wtmp: %s", strerror(-r));