chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kdbus: when running in a container, don't complain that we cannot write to /sys
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-kernel.c
diff --git
a/src/libsystemd/sd-bus/bus-kernel.c
b/src/libsystemd/sd-bus/bus-kernel.c
index a7d18e337b874244b97cccfc9348ffa10c68f74d..84fb4bdf2b4af185c8ab6f0de7523c96d5a6ce79 100644
(file)
--- 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);
* 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;
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);
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;
}
return 0;
}