chiark / gitweb /
kdbus: when running in a container, don't complain that we cannot write to /sys
authorLennart Poettering <lennart@poettering.net>
Fri, 28 Nov 2014 01:30:43 +0000 (02:30 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 28 Nov 2014 02:16:56 +0000 (03:16 +0100)
src/libsystemd/sd-bus/bus-kernel.c

index a7d18e3..84fb4bd 100644 (file)
@@ -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;
 }