forked from pool/systemd
74b2bf3650
- Extend avoid-divide-by-zero-sigtrap.patch to make the crash handler know about SIGTRAP and SIGSYS - Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 that is a divide by zero on a jobless system - Use latest regenerate-initrd rpm macros (fate#313506) - Add rescue-emergency-target-conflicts.patch to avoid that emergency and rescue sulogin are fighting on console - Modify systemd-sleep-grub to let hybrid-sleep.target work even on XEN, changes from Thomas Blume (bnc#873432) - Add backported upstream patch 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch - Add patch systemd-detect-xendom.patch from Thomas Blume to be able to detect XEN dom0 as well as domU - systemd conflicts with sysvinit, ven if the package systemd-sysvinit does already conflict with sysvinit-init (bnc#873444) - Extend avoid-divide-by-zero-sigtrap.patch to make the crash handler know about SIGTRAP and SIGSYS - Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 that is a divide by zero on a jobless system - Use latest regenerate-initrd rpm macros (fate#313506) - Add rescue-emergency-target-conflicts.patch to avoid that emergency and rescue sulogin are fighting on console OBS-URL: https://build.opensuse.org/request/show/230483 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=182
28 lines
1.2 KiB
Diff
28 lines
1.2 KiB
Diff
Based on b2103dccb354de3f38c49c14ccb637bdf665e40f Mon Sep 17 00:00:00 2001
|
|
From: Kay Sievers <kay@vrfy.org>
|
|
Date: Sat, 5 Apr 2014 13:59:01 -0400
|
|
Subject: [PATCH] reduce the amount of messages logged to /dev/kmsg when
|
|
"debug" is specified
|
|
|
|
---
|
|
src/core/main.c | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
--- src/core/main.c
|
|
+++ src/core/main.c 2014-04-14 13:50:48.490814738 +0000
|
|
@@ -412,12 +412,8 @@ static int parse_proc_cmdline_word(const
|
|
if (arg_show_status == _SHOW_STATUS_UNSET)
|
|
arg_show_status = SHOW_STATUS_AUTO;
|
|
} else if (streq(word, "debug")) {
|
|
- /* Log to kmsg, the journal socket will fill up before the
|
|
- * journal is started and tools running during that time
|
|
- * will block with every log message for for 60 seconds,
|
|
- * before they give up. */
|
|
- log_set_max_level(LOG_DEBUG);
|
|
- log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG);
|
|
+ if (detect_container(NULL) > 0)
|
|
+ log_set_target(LOG_TARGET_CONSOLE);
|
|
} else if (!in_initrd()) {
|
|
unsigned i;
|
|
|