chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
def: centralize definition of default timeout in one place
[elogind.git]
/
src
/
manager.c
diff --git
a/src/manager.c
b/src/manager.c
index cee434466591f2c28dc53dfffcd9e2b80ee0ec16..9edb8f09bbc990abc41e9904b71f6291e7ea0f75 100644
(file)
--- a/
src/manager.c
+++ b/
src/manager.c
@@
-2057,6
+2057,8
@@
static int manager_process_signal_fd(Manager *m) {
assert(m);
for (;;) {
assert(m);
for (;;) {
+ char *p = NULL;
+
if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0)
if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0)
@@
-2068,7
+2070,13
@@
static int manager_process_signal_fd(Manager *m) {
return -errno;
}
return -errno;
}
- log_debug("Received SIG%s", strna(signal_to_string(sfsi.ssi_signo)));
+ if (sfsi.ssi_pid > 0)
+ get_process_name(sfsi.ssi_pid, &p);
+
+ log_debug("Received SIG%s from PID %lu (%s)",
+ strna(signal_to_string(sfsi.ssi_signo)),
+ (unsigned long) sfsi.ssi_pid, strna(p));
+ free(p);
switch (sfsi.ssi_signo) {
switch (sfsi.ssi_signo) {
@@
-2835,7
+2843,8
@@
void manager_check_finished(Manager *m) {
dual_timestamp_get(&m->finish_timestamp);
dual_timestamp_get(&m->finish_timestamp);
- if (m->running_as == MANAGER_SYSTEM) {
+ if (m->running_as == MANAGER_SYSTEM && detect_container(NULL) <= 0) {
+
if (dual_timestamp_is_set(&m->initrd_timestamp)) {
log_info("Startup finished in %s (kernel) + %s (initrd) + %s (userspace) = %s.",
format_timespan(kernel, sizeof(kernel),
if (dual_timestamp_is_set(&m->initrd_timestamp)) {
log_info("Startup finished in %s (kernel) + %s (initrd) + %s (userspace) = %s.",
format_timespan(kernel, sizeof(kernel),