From 1214b53c8e463ec328021e90163279ac94dd9af8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 28 Nov 2014 02:30:43 +0100 Subject: [PATCH 1/1] kdbus: when running in a container, don't complain that we cannot write to /sys --- src/libsystemd/sd-bus/bus-kernel.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index a7d18e337..84fb4bdf2 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -1810,10 +1810,8 @@ int bus_kernel_fix_attach_mask(void) { * line option, however. */ r = get_proc_cmdline_key("systemd.kdbus_attach_flags_mask=", &mask); - if (r < 0) { - log_warning_errno(-r, "Failed to read kernel command line: %m"); - return r; - } + if (r < 0) + return log_warning_errno(r, "Failed to read kernel command line: %m"); if (mask) { const char *p = mask; @@ -1827,10 +1825,10 @@ int bus_kernel_fix_attach_mask(void) { sprintf(buf, "0x%" PRIx64 "\n", m); r = write_string_file("/sys/module/kdbus/parameters/attach_flags_mask", buf); - if (r < 0) { - log_warning_errno(-r, "Failed to write kdbus attach mask: %m"); - return r; - } + if (r < 0) + return log_full_errno( + r == -EROFS ? LOG_DEBUG : LOG_WARNING, r, + "Failed to write kdbus attach mask: %m"); return 0; } -- 2.30.2