summaryrefslogtreecommitdiff
path: root/src/nspawn/nspawn.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-11-03 13:59:20 -0600
committerGitHub <noreply@github.com>2016-11-03 13:59:20 -0600
commit493fd52f1ada36bfe63301d4bb50f7fd2b38c670 (patch)
tree19864f5568a2fe48181c1b3f33c46b4db36dd768 /src/nspawn/nspawn.c
parenta1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff)
parent9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff)
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/nspawn/nspawn.c')
-rw-r--r--src/nspawn/nspawn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index c56af6e6f4..673e616911 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2547,7 +2547,7 @@ static int determine_names(void) {
* search for a machine, but instead create a new one
* in /var/lib/machine. */
- arg_directory = strjoin("/var/lib/machines/", arg_machine, NULL);
+ arg_directory = strjoin("/var/lib/machines/", arg_machine);
if (!arg_directory)
return log_oom();
}
@@ -3390,7 +3390,7 @@ static int load_settings(void) {
FOREACH_STRING(i, "/etc/systemd/nspawn", "/run/systemd/nspawn") {
_cleanup_free_ char *j = NULL;
- j = strjoin(i, "/", fn, NULL);
+ j = strjoin(i, "/", fn);
if (!j)
return log_oom();