forked from pool/systemd
Marcus Meissner
d6bb3d7a51
- Update to new upstream release 227+228 tested boot-on-cryptoroot OBS-URL: https://build.opensuse.org/request/show/345072 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=920
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
Nasty bug reported on boo#867663
|
|
|
|
---
|
|
src/basic/def.h | 2 +-
|
|
src/core/manager.c | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
Index: systemd-228/src/basic/def.h
|
|
===================================================================
|
|
--- systemd-228.orig/src/basic/def.h
|
|
+++ systemd-228/src/basic/def.h
|
|
@@ -40,7 +40,7 @@
|
|
|
|
#define SYSTEMD_CGROUP_CONTROLLER "name=systemd"
|
|
|
|
-#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
|
|
+#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT,SIGTRAP,SIGSYS
|
|
#define SIGNALS_IGNORE SIGPIPE
|
|
|
|
#define REBOOT_PARAM_FILE "/run/systemd/reboot-param"
|
|
Index: systemd-228/src/core/manager.c
|
|
===================================================================
|
|
--- systemd-228.orig/src/core/manager.c
|
|
+++ systemd-228/src/core/manager.c
|
|
@@ -2003,7 +2003,8 @@ static int manager_dispatch_jobs_in_prog
|
|
assert(m);
|
|
assert(source);
|
|
|
|
- manager_print_jobs_in_progress(m);
|
|
+ if (m->n_running_jobs > 0)
|
|
+ manager_print_jobs_in_progress(m);
|
|
|
|
next = now(CLOCK_MONOTONIC) + JOBS_IN_PROGRESS_PERIOD_USEC;
|
|
r = sd_event_source_set_time(source, next);
|