Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
steam
systemd
Commits
e83b0f94
Commit
e83b0f94
authored
Jul 01, 2016
by
Michael Biebl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't reset log level to NOTICE if we get quiet on the kernel cmdline
Closes: #828006
parent
036d0949
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
0 deletions
+43
-0
debian/changelog
debian/changelog
+2
-0
debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet-on-t.patch
...on-t-reset-log-level-to-NOTICE-if-we-get-quiet-on-t.patch
+40
-0
debian/patches/series
debian/patches/series
+1
-0
No files found.
debian/changelog
View file @
e83b0f94
...
...
@@ -2,6 +2,8 @@ systemd (215-17+deb8u5) UNRELEASED; urgency=medium
*
Use
the
right
timeout
for
stop
processes
we
fork
.
This
ensures
that
services
are
properly
killed
after
a
given
timeout
.
(
Closes
:
#
813702
)
*
Don
't reset log level to NOTICE if we get quiet on the kernel cmdline.
(Closes: #828006)
-- Michael Biebl <biebl@debian.org> Fri, 01 Jul 2016 17:35:05 +0200
...
...
debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet-on-t.patch
0 → 100644
View file @
e83b0f94
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 4 Feb 2015 01:42:49 +0100
Subject: core: don't reset log level to NOTICE if we get quiet on the kernel
cmdline
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
quiet should really just have an effect on the stuff we dump on the
console, not what we log elsewhere.
Hence:
debug on kernel cmdline → interpreted by every tool, turns up
log levels to "debug" everywhere.
quiet on kernel cmdline → interpreted only by PID 1 (and
obviously the kernel) no alteration of the max log level, but
turns off status output.
http://lists.freedesktop.org/archives/systemd-devel/2014-December/026271.html
(cherry-picked from commit 5e07a79e84ab8b045b9df1a2719f14fc84471a1d)
---
src/core/main.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/core/main.c b/src/core/main.c
index 904cdb8..7ad4bb0 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -377,8 +377,6 @@
static int parse_proc_cmdline_item(const char *key, const char *value) {
} else if (streq(key, "quiet") && !value) {
- log_set_max_level(LOG_NOTICE);
-
if (arg_show_status == _SHOW_STATUS_UNSET)
arg_show_status = SHOW_STATUS_AUTO;
debian/patches/series
View file @
e83b0f94
...
...
@@ -159,6 +159,7 @@ sd-dhcp-client-make-request-broadcasts-configurable.patch
make-sure-all-swap-units-are-ordered-before-the-swap-targ.patch
nspawn-fix-network-interface.patch
service-use-the-right-timeout-for-stop-processes-we-fork.patch
core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet-on-t.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment