summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-12-12 16:58:30 +0100
committerLennart Poettering <lennart@poettering.net>2014-12-12 17:30:25 +0100
commit53e438e3016e6b8304834d784fd0bbfeeb17cb77 (patch)
treef68f1e00249fb3a2a69f1f89c0732cff8a3c9773 /src
parent7430ec6ac08f2c0416d9f806964c46b30f3862b2 (diff)
nspawn: properly unset arg_link_journal_try, when --link-journal= is specified
Diffstat (limited to 'src')
-rw-r--r--src/nspawn/nspawn.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 1bfc99d5fc..8082166ee2 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -477,15 +477,19 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_LINK_JOURNAL:
- if (streq(optarg, "auto"))
+ if (streq(optarg, "auto")) {
arg_link_journal = LINK_AUTO;
- else if (streq(optarg, "no"))
+ arg_link_journal_try = false;
+ } else if (streq(optarg, "no")) {
arg_link_journal = LINK_NO;
- else if (streq(optarg, "guest"))
+ arg_link_journal_try = false;
+ } else if (streq(optarg, "guest")) {
arg_link_journal = LINK_GUEST;
- else if (streq(optarg, "host"))
+ arg_link_journal_try = false;
+ } else if (streq(optarg, "host")) {
arg_link_journal = LINK_HOST;
- else if (streq(optarg, "try-guest")) {
+ arg_link_journal_try = false;
+ } else if (streq(optarg, "try-guest")) {
arg_link_journal = LINK_GUEST;
arg_link_journal_try = true;
} else if (streq(optarg, "try-host")) {