diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-24 17:24:23 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-24 18:31:26 +0200 |
| commit | 270384b2d494bd1f53242c923f875ccfdf6e214d (patch) | |
| tree | 66b619dc3c5e218b9ac87b5034d807a78fda5cb7 /src/portable | |
| parent | tree-wide: replace strjoin() with path_join() (diff) | |
| download | systemd-270384b2d494bd1f53242c923f875ccfdf6e214d.tar.xz systemd-270384b2d494bd1f53242c923f875ccfdf6e214d.zip | |
tree-wide: replace strjoina() with prefix_roota()
Diffstat (limited to 'src/portable')
| -rw-r--r-- | src/portable/portable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/portable/portable.c b/src/portable/portable.c index 8202a8ca2e..4956ae7310 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -653,10 +653,10 @@ static int portable_changes_add_with_prefix( return 0; if (prefix) { - path = strjoina(prefix, "/", path); + path = prefix_roota(prefix, path); if (source) - source = strjoina(prefix, "/", source); + source = prefix_roota(prefix, source); } return portable_changes_add(changes, n_changes, type, path, source); @@ -847,7 +847,7 @@ static int attach_unit_file( } else (void) portable_changes_add(changes, n_changes, PORTABLE_MKDIR, where, NULL); - path = strjoina(where, "/", m->name); + path = prefix_roota(where, m->name); dropin_dir = strjoin(path, ".d"); if (!dropin_dir) return -ENOMEM; |