chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: rework automatic dependency logic between automounts, mounts, sockets, swaps
[elogind.git]
/
manager.c
diff --git
a/manager.c
b/manager.c
index cf1c1481c12d32859dd6a2449dbac94a9ed2df8c..6913ff400db9dee435779b76fc5e5e6892781f28 100644
(file)
--- a/
manager.c
+++ b/
manager.c
@@
-51,6
+51,7
@@
#include "unit-name.h"
#include "dbus-unit.h"
#include "dbus-job.h"
#include "unit-name.h"
#include "dbus-unit.h"
#include "dbus-job.h"
+#include "missing.h"
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#define GC_QUEUE_ENTRIES_MAX 16
/* As soon as 16 units are in our GC queue, make sure to run a gc sweep */
#define GC_QUEUE_ENTRIES_MAX 16
@@
-253,7
+254,7
@@
static int manager_find_paths(Manager *m) {
}
if (m->running_as == MANAGER_INIT) {
}
if (m->running_as == MANAGER_INIT) {
- /* /etc/init.d/ compati
v
ility does not matter to users */
+ /* /etc/init.d/ compati
b
ility does not matter to users */
if ((e = getenv("SYSTEMD_SYSVINIT_PATH")))
if (!(m->sysvinit_path = split_path_and_make_absolute(e)))
if ((e = getenv("SYSTEMD_SYSVINIT_PATH")))
if (!(m->sysvinit_path = split_path_and_make_absolute(e)))
@@
-336,6
+337,9
@@
int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) {
m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = m->dev_autofs_fd = -1;
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = m->dev_autofs_fd = -1;
m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */
+ if (!(m->environment = strv_copy(environ)))
+ goto fail;
+
if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
if (!(m->units = hashmap_new(string_hash_func, string_compare_func)))
goto fail;
@@
-544,6
+548,7
@@
void manager_free(Manager *m) {
strv_free(m->unit_path);
strv_free(m->sysvinit_path);
strv_free(m->sysvrcnd_path);
strv_free(m->unit_path);
strv_free(m->sysvinit_path);
strv_free(m->sysvrcnd_path);
+ strv_free(m->environment);
free(m->cgroup_controller);
free(m->cgroup_hierarchy);
free(m->cgroup_controller);
free(m->cgroup_hierarchy);
@@
-1816,12
+1821,7
@@
static int manager_process_signal_fd(Manager *m) {
/* This is a nop on non-init */
break;
/* This is a nop on non-init */
break;
- case SIGUSR1:
- manager_dump_units(m, stdout, "\t");
- manager_dump_jobs(m, stdout, "\t");
- break;
-
- case SIGUSR2: {
+ case SIGUSR1: {
Unit *u;
u = manager_get_unit(m, SPECIAL_DBUS_SERVICE);
Unit *u;
u = manager_get_unit(m, SPECIAL_DBUS_SERVICE);
@@
-1840,6
+1840,11
@@
static int manager_process_signal_fd(Manager *m) {
break;
}
break;
}
+ case SIGUSR2:
+ manager_dump_units(m, stdout, "\t");
+ manager_dump_jobs(m, stdout, "\t");
+ break;
+
case SIGHUP:
m->exit_code = MANAGER_RELOAD;
break;
case SIGHUP:
m->exit_code = MANAGER_RELOAD;
break;