From 1afd5be42f8f4105dd47c71ce968c9d5bf81e0a8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 23 May 2012 12:49:41 +0200 Subject: [PATCH] journal: don't complain if SELinux userspace is available but the kernel lacks it --- TODO | 4 ++-- src/journal/journald.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TODO b/TODO index b3b8f40f..a0be14d0 100644 --- a/TODO +++ b/TODO @@ -23,6 +23,8 @@ Bugfixes: Features: +* For Type=idle don't get confused by ExecStartPre= getting the effect of the idle hup but delaying jobs going away + * drop accountsservice's StandardOutput=syslog and Type=dbus fields * systemctl status for a unloaded unit is broken (Michal?) @@ -111,8 +113,6 @@ Features: * allow configuration of console width/height in vconsole.conf -* fstab should take priority over units in /usr - * cleanup syslog 'priority' vs. 'level' wording * journal: if mmap() fails for mapping window try to unmap a a few older maps diff --git a/src/journal/journald.c b/src/journal/journald.c index c429896a..7776c2a2 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -1692,8 +1692,8 @@ static int stdout_stream_new(Server *s) { } #ifdef HAVE_SELINUX - if (getpeercon(fd, &stream->security_context) < 0) - log_error("Failed to determine peer security context."); + if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT) + log_error("Failed to determine peer security context: %m"); #endif if (shutdown(fd, SHUT_WR) < 0) { -- 2.39.5