diff options
Diffstat (limited to 'src/nspawn/nspawn.c')
| -rw-r--r-- | src/nspawn/nspawn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index e7f8cf389f..b3f4be0e6e 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1934,7 +1934,7 @@ static int copy_devnodes(const char *dest) { if (r < 0) return log_error_errno(r, "chown() of device node %s failed: %m", to); - dn = strjoin("/dev/", S_ISCHR(st.st_mode) ? "char" : "block"); + dn = path_join("/dev", S_ISCHR(st.st_mode) ? "char" : "block"); if (!dn) return log_oom(); @@ -2596,7 +2596,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); + arg_directory = path_join("/var/lib/machines", arg_machine); if (!arg_directory) return log_oom(); } @@ -3991,7 +3991,7 @@ static int load_settings(void) { FOREACH_STRING(i, "/etc/systemd/nspawn", "/run/systemd/nspawn") { _cleanup_free_ char *j = NULL; - j = strjoin(i, "/", fn); + j = path_join(i, fn); if (!j) return log_oom(); |