journal: don't complain if SELinux userspace is available but the kernel lacks it

diff --git a/TODO b/TODO
index b3b8f40f0a8520e29964ad4eb85738f6e2ca18e3..a0be14d0daec124c0e3db70adb1e315b24dcfbdf 100644 (file)
--- 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 c429896ac40cbd4aa9cb8530da247fe853743fbb..7776c2a25c4e58a624b9a40a849e1fb154d9ebb2 100644 (file)
--- 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) {