chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: don't warn loudly if we cannot send a bus signal to a disconnected client
[elogind.git]
/
src
/
core
/
condition.c
diff --git
a/src/core/condition.c
b/src/core/condition.c
index c53d4066822cffd741412f85271cf8f294eaf329..436e7840d0e63a35883d9195565183a4bde384d6 100644
(file)
--- a/
src/core/condition.c
+++ b/
src/core/condition.c
@@
-86,14
+86,11
@@
static bool test_kernel_command_line(const char *parameter) {
assert(parameter);
assert(parameter);
- if (detect_container(NULL) > 0)
- return false;
-
- r = read_one_line_file("/proc/cmdline", &line);
- if (r < 0) {
+ r = proc_cmdline(&line);
+ if (r < 0)
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r));
+ if (r <= 0)
return false;
return false;
- }
equal = !!strchr(parameter, '=');
pl = strlen(parameter);
equal = !!strchr(parameter, '=');
pl = strlen(parameter);