summaryrefslogtreecommitdiffstats
path: root/src/shared/generator.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-06-24 17:24:23 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-06-24 18:31:26 +0200
commit270384b2d494bd1f53242c923f875ccfdf6e214d (patch)
tree66b619dc3c5e218b9ac87b5034d807a78fda5cb7 /src/shared/generator.c
parenttree-wide: replace strjoin() with path_join() (diff)
downloadsystemd-270384b2d494bd1f53242c923f875ccfdf6e214d.tar.xz
systemd-270384b2d494bd1f53242c923f875ccfdf6e214d.zip
tree-wide: replace strjoina() with prefix_roota()
Diffstat (limited to 'src/shared/generator.c')
-rw-r--r--src/shared/generator.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 0a5413ce04..7273fde186 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -31,7 +31,7 @@ int generator_open_unit_file(
FILE *f;
int r;
- unit = strjoina(dest, "/", name);
+ unit = prefix_roota(dest, name);
r = fopen_unlocked(unit, "wxe", &f);
if (r < 0) {
@@ -319,7 +319,7 @@ int generator_hook_up_mkswap(
return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m",
node);
- unit_file = strjoina(dir, "/", unit);
+ unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
escaped = cescape(node);
@@ -394,7 +394,7 @@ int generator_hook_up_mkfs(
return log_error_errno(r, "Failed to make unit instance name from path \"%s\": %m",
node);
- unit_file = strjoina(dir, "/", unit);
+ unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
escaped = cescape(node);
@@ -466,7 +466,7 @@ int generator_hook_up_growfs(
return log_error_errno(r, "Failed to make unit name from path \"%s\": %m",
where);
- unit_file = strjoina(dir, "/", unit);
+ unit_file = prefix_roota(dir, unit);
log_debug("Creating %s", unit_file);
f = fopen(unit_file, "wxe");