summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-05-23 12:49:41 +0200
committerLennart Poettering <lennart@poettering.net>2012-05-23 12:49:41 +0200
commit1afd5be42f8f4105dd47c71ce968c9d5bf81e0a8 (patch)
tree9d55397962a748f1af7b6de15eb3a9cd0b54499b
parent66b1a24790ccc3c60509e6f94890ed8c20a2fe9e (diff)
journal: don't complain if SELinux userspace is available but the kernel lacks it
-rw-r--r--TODO4
-rw-r--r--src/journal/journald.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/TODO b/TODO
index b3b8f40f0a..a0be14d0da 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 c429896ac4..7776c2a25c 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) {