chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[elogind.git]
/
src
/
shared
/
condition.c
diff --git
a/src/shared/condition.c
b/src/shared/condition.c
index 08bebeee73c22619edd9833dd89b41467cff0972..59f262244b202a3f7aa6bc72ed13e5ea023bea18 100644
(file)
--- a/
src/shared/condition.c
+++ b/
src/shared/condition.c
@@
-33,7
+33,6
@@
#include "fileio.h"
#include "unit.h"
#include "architecture.h"
#include "fileio.h"
#include "unit.h"
#include "architecture.h"
-#include "virt.h"
#include "smack-util.h"
#include "apparmor-util.h"
#include "ima-util.h"
#include "smack-util.h"
#include "apparmor-util.h"
#include "ima-util.h"
@@
-93,8
+92,6
@@
static int condition_test_kernel_command_line(Condition *c) {
r = proc_cmdline(&line);
if (r < 0)
return r;
r = proc_cmdline(&line);
if (r < 0)
return r;
- if (r == 0)
- return false;
equal = !!strchr(c->parameter, '=');
p = line;
equal = !!strchr(c->parameter, '=');
p = line;
@@
-103,7
+100,7
@@
static int condition_test_kernel_command_line(Condition *c) {
_cleanup_free_ char *word = NULL;
bool found;
_cleanup_free_ char *word = NULL;
bool found;
- r = unquote_first_word(&p, &word);
+ r = unquote_first_word(&p, &word
, true
);
if (r < 0)
return r;
if (r == 0)
if (r < 0)
return r;
if (r == 0)