Brian Kroth <bpkr...@gmail.com> 2016-06-24 13:21:
Michael Biebl <bi...@debian.org> 2016-06-23 23:41:Control: tags -1 + moreinfoHi Brian Am 23.06.2016 um 19:09 schrieb Brian Kroth:Per [1], the current version of systemd in Debian Jessie (v215) has an issue that makes the "quiet" kernel boot parameter override values of LogLevel= in the /etc/systemd/system.conf file (mine has LogLevel=info explicitly set) and explicitly sets it to "notice" instead of the documented default of "info". There's a simple patch [2] that fixes this that I'd like to suggest backporting.That commit seem okayish for a jessie backport[2] <https://cgit.freedesktop.org/systemd/systemd/commit/?id=5e07a79e84ab8b045b9df1a2719f14fc84471a1d>A simple cherry-pick of 5e07a79e on top of v215 fails. Have you backported this commit for v215 and given it some testing? If so, can you attach the (tested) patch to this bug report. Regards, MichaelHi, sorry, I ran out of time before the weekend. I'll try and finish testing that and get back to you sometime on Monday.I'll note that I had to use the following to cherrypick the patch from git since the changes to src/shared/log.c (just comments) failed to match anything nearby:# git format-patch -1 5e07a79e84ab8b045b9df1a2719f14fc84471a1d -- src/core/main.c Cheers, Brian
Hi, I've done a little bit of testing with the patch and it does indeed appear to fix the issue. Here's the resulting diff for the package I built. Let me know if you need anything else.
Thanks, Brian
diff -u -ruN systemd_215-17+deb8u4.debian/debian/changelog systemd_215-17+deb8u4.1.debian/debian/changelog --- systemd_215-17+deb8u4.debian/debian/changelog 2016-03-03 12:51:40.000000000 -0600 +++ systemd_215-17+deb8u4.1.debian/debian/changelog 2016-06-24 13:08:05.000000000 -0500 @@ -1,3 +1,10 @@ +systemd (215-17+deb8u4.1) UNRELEASED; urgency=medium + + * Backport systemd patch to not overwrite the LogLevel set in + /etc/systemd/system.conf (Bug #828006). + + -- Brian Kroth <bpkr...@gmail.com> Fri, 24 Jun 2016 13:03:25 -0500 + systemd (215-17+deb8u4) stable; urgency=medium [ Martin Pitt ] diff -u -ruN systemd_215-17+deb8u4.debian/debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet.patch systemd_215-17+deb8u4.1.debian/debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet.patch --- systemd_215-17+deb8u4.debian/debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet.patch 1969-12-31 18:00:00.000000000 -0600 +++ systemd_215-17+deb8u4.1.debian/debian/patches/core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet.patch 2016-06-24 13:18:43.000000000 -0500 @@ -0,0 +1,42 @@ +From 5e07a79e84ab8b045b9df1a2719f14fc84471a1d Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lenn...@poettering.net> +Date: Wed, 4 Feb 2015 01:42:49 +0100 +Subject: [PATCH] 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 +--- + src/core/main.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/core/main.c b/src/core/main.c +index 0480bc8..0749f04 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -367,8 +367,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; + +-- +1.7.10.4 + diff -u -ruN systemd_215-17+deb8u4.debian/debian/patches/series systemd_215-17+deb8u4.1.debian/debian/patches/series --- systemd_215-17+deb8u4.debian/debian/patches/series 2016-03-03 12:51:40.000000000 -0600 +++ systemd_215-17+deb8u4.1.debian/debian/patches/series 2016-06-24 13:12:57.000000000 -0500 @@ -95,6 +95,7 @@ timesyncd-allow-two-missed-replies-before-reselectin.patch timesyncd-don-t-reset-polling-interval-when-reselect.patch backlight-Avoid-error-when-state-restore-is-disabled.patch +core-don-t-reset-log-level-to-NOTICE-if-we-get-quiet.patch ## Cherry-picked patches: util-avoid-considering-dpkg-temporary-files-relevant.patch
signature.asc
Description: Digital signature
