X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=manager.c;h=0a108087172064f6ed14e169d605cd94e1cf38b5;hp=42059a500717f7fd77516ea63f12184783bea0e4;hb=601f6a1e820462b1df6ff632d112bef241d556b1;hpb=23a177ef7c8c38c238ef06666f900f581b48298f diff --git a/manager.c b/manager.c index 42059a500..0a1080871 100644 --- a/manager.c +++ b/manager.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,7 @@ #include "ratelimit.h" #include "cgroup.h" #include "mount-setup.h" +#include "utmp-wtmp.h" static int manager_setup_signals(Manager *m) { sigset_t mask; @@ -49,8 +51,6 @@ static int manager_setup_signals(Manager *m) { assert(m); - assert_se(reset_all_signal_handlers() == 0); - assert_se(sigemptyset(&mask) == 0); assert_se(sigaddset(&mask, SIGCHLD) == 0); assert_se(sigaddset(&mask, SIGINT) == 0); /* Kernel sends us this on control-alt-del */ @@ -234,10 +234,24 @@ static int manager_find_paths(Manager *m) { NULL))) return -ENOMEM; } + + if ((e = getenv("SYSTEMD_SYSVRCND_PATH"))) + if (!(m->sysvrcnd_path = split_path_and_make_absolute(e))) + return -ENOMEM; + + if (strv_isempty(m->sysvrcnd_path)) { + strv_free(m->sysvrcnd_path); + + if (!(m->sysvrcnd_path = strv_new( + SYSTEM_SYSVRCND_PATH, /* /etc/rcN.d/ */ + NULL))) + 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"))) @@ -255,18 +269,33 @@ static int manager_find_paths(Manager *m) { } else log_debug("Ignoring SysV init scripts."); + if (!strv_isempty(m->sysvrcnd_path)) { + + if (!(t = strv_join(m->sysvrcnd_path, "\n\t"))) + return -ENOMEM; + + log_debug("Looking for SysV rcN.d links in:\n\t%s", t); + free(t); + } else + log_debug("Ignoring SysV rcN.d links."); + return 0; } -int manager_new(Manager **_m) { +int manager_new(ManagerRunningAs running_as, Manager **_m) { Manager *m; int r = -ENOMEM; assert(_m); + assert(running_as >= 0); + assert(running_as < _MANAGER_RUNNING_AS_MAX); if (!(m = new0(Manager, 1))) return -ENOMEM; + m->boot_timestamp = now(CLOCK_REALTIME); + + m->running_as = running_as; m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = -1; m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */ @@ -288,35 +317,18 @@ int manager_new(Manager **_m) { if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) goto fail; - if (getpid() == 1) - m->running_as = MANAGER_INIT; - else if (getuid() == 0) - m->running_as = MANAGER_SYSTEM; - else - m->running_as = MANAGER_SESSION; - - log_debug("systemd running in %s mode.", manager_running_as_to_string(m->running_as)); - if ((r = manager_find_paths(m)) < 0) goto fail; - if (chdir("/") < 0) - log_warning("Failed to chdir to /: %s", strerror(errno)); - - /* Become a session leader if we aren't one yet. */ - setsid(); - if ((r = manager_setup_signals(m)) < 0) goto fail; - if ((r = mount_setup()) < 0) - goto fail; - if ((r = manager_setup_cgroup(m)) < 0) goto fail; - /* FIXME: this should be called only when the D-Bus bus daemon is running */ - if ((r = bus_init(m)) < 0) + /* Try to connect to the busses, if possible. */ + if ((r = bus_init_system(m)) < 0 || + (r = bus_init_api(m)) < 0) goto fail; *_m = m; @@ -364,7 +376,8 @@ void manager_free(Manager *m) { manager_shutdown_cgroup(m); - bus_done(m); + bus_done_api(m); + bus_done_system(m); hashmap_free(m->units); hashmap_free(m->jobs); @@ -378,6 +391,7 @@ void manager_free(Manager *m) { strv_free(m->unit_path); strv_free(m->sysvinit_path); + strv_free(m->sysvrcnd_path); free(m->cgroup_controller); free(m->cgroup_hierarchy); @@ -418,6 +432,10 @@ int manager_coldplug(Manager *m) { return r; } + /* Now that the initial devices are available, let's see if we + * can write the utmp file */ + manager_write_utmp_reboot(m); + return 0; } @@ -1175,8 +1193,8 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit * if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !force, force, NULL)) < 0 && r != -EBADR) goto fail; SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0 && r != -EBADR) - goto fail; + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, force, NULL)) < 0) + log_warning("Cannot add dependency job for unit %s, ignoring: %s", unit_id(dep), strerror(-r)); SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i) if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, force, NULL)) < 0 && r != -EBADR) goto fail; @@ -1404,8 +1422,6 @@ unsigned manager_dispatch_dbus_queue(Manager *m) { static int manager_dispatch_sigchld(Manager *m) { assert(m); - log_debug("dispatching SIGCHLD"); - for (;;) { siginfo_t si; Unit *u; @@ -1430,6 +1446,8 @@ static int manager_dispatch_sigchld(Manager *m) { if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid)))) continue; + log_debug("child %llu belongs to %s", (long long unsigned) si.si_pid, unit_id(u)); + UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status); } @@ -1457,9 +1475,16 @@ static int manager_process_signal_fd(Manager *m, bool *quit) { switch (sfsi.ssi_signo) { - case SIGCHLD: + case SIGCHLD: { + char *name = NULL; + + get_process_name(sfsi.ssi_pid, &name); + log_debug("Got SIGCHLD for process %llu (%s)", (unsigned long long) sfsi.ssi_pid, strna(name)); + free(name); + sigchld = true; break; + } case SIGINT: case SIGTERM: @@ -1498,6 +1523,16 @@ static int manager_process_signal_fd(Manager *m, bool *quit) { break; + case SIGUSR1: + + printf("→ By units:\n"); + manager_dump_units(m, stdout, "\t"); + + printf("→ By jobs:\n"); + manager_dump_jobs(m, stdout, "\t"); + + break; + default: log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo)); } @@ -1677,6 +1712,72 @@ int manager_get_job_from_dbus_path(Manager *m, const char *s, Job **_j) { return 0; } +static bool manager_utmp_good(Manager *m) { + int r; + + assert(m); + + if ((r = mount_path_is_mounted(m, _PATH_UTMPX)) <= 0) { + + if (r < 0) + log_warning("Failed to determine whether " _PATH_UTMPX " is mounted: %s", strerror(-r)); + + return false; + } + + return true; +} + +void manager_write_utmp_reboot(Manager *m) { + int r; + + assert(m); + + if (m->utmp_reboot_written) + return; + + if (m->running_as != MANAGER_INIT) + return; + + if (!manager_utmp_good(m)) + return; + + if ((r = utmp_put_reboot(m->boot_timestamp)) < 0) { + + if (r != -ENOENT && r != -EROFS) + log_warning("Failed to write utmp/wtmp: %s", strerror(-r)); + + return; + } + + m->utmp_reboot_written = true; +} + +void manager_write_utmp_runlevel(Manager *m, Unit *u) { + int runlevel, r; + + assert(m); + assert(u); + + if (u->meta.type != UNIT_TARGET) + return; + + if (m->running_as != MANAGER_INIT) + return; + + if (!manager_utmp_good(m)) + return; + + if ((runlevel = target_get_runlevel(TARGET(u))) <= 0) + return; + + if ((r = utmp_put_runlevel(0, runlevel, 0)) < 0) { + + if (r != -ENOENT && r != -EROFS) + log_warning("Failed to write utmp/wtmp: %s", strerror(-r)); + } +} + static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = { [MANAGER_INIT] = "init", [MANAGER_SYSTEM] = "system",