diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
| commit | 79bec997c911be7c903db9f7e5d07ab2cd303ed7 (patch) | |
| tree | 1e6e62138a8920a3210b8063157612b484efbea6 /src/core | |
| parent | f74431288aec78ffdd05be9a519eab3dbe1c4f81 (diff) | |
| parent | e287086b8aa2558356af225a12d9bfea8e7d61ca (diff) | |
Merge pull request #1484 from poettering/ask-pass-kernel-keyring
cache harddisk passwords in the kernel keyring
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 2 | ||||
| -rw-r--r-- | src/core/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 4664af873f..f5baad05f3 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2725,7 +2725,7 @@ int exec_command_append(ExecCommand *c, const char *path, ...) { if (!l) return -ENOMEM; - r = strv_extend_strv(&c->argv, l); + r = strv_extend_strv(&c->argv, l, false); if (r < 0) return r; diff --git a/src/core/main.c b/src/core/main.c index 2454c8b962..87b3af92bc 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -599,7 +599,7 @@ static int config_parse_join_controllers(const char *unit, for (a = arg_join_controllers; *a; a++) { if (strv_overlap(*a, l)) { - if (strv_extend_strv(&l, *a) < 0) { + if (strv_extend_strv(&l, *a, false) < 0) { strv_free(l); strv_free_free(t); return log_oom(); |