diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-24 16:59:38 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-06-24 16:59:38 +0200 |
| commit | 2d9b74ba87a3fef313f362460d5d9a4283548ff6 (patch) | |
| tree | 362629c9252929edebdd172dfd932e8cca339a5f /src/veritysetup | |
| parent | test: add more testcases for prefix_roota() (diff) | |
| download | systemd-2d9b74ba87a3fef313f362460d5d9a4283548ff6.tar.xz systemd-2d9b74ba87a3fef313f362460d5d9a4283548ff6.zip | |
tree-wide: replace strjoin() with path_join()
Diffstat (limited to 'src/veritysetup')
| -rw-r--r-- | src/veritysetup/veritysetup-generator.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/veritysetup/veritysetup-generator.c b/src/veritysetup/veritysetup-generator.c index 65a4e7b0fd..f2b74f3dc1 100644 --- a/src/veritysetup/veritysetup-generator.c +++ b/src/veritysetup/veritysetup-generator.c @@ -16,6 +16,7 @@ #include "main-func.h" #include "mkdir.h" #include "parse-util.h" +#include "path-util.h" #include "proc-cmdline.h" #include "specifier.h" #include "string-util.h" @@ -188,7 +189,7 @@ static int determine_devices(void) { if (!arg_data_what) { memcpy(&root_uuid, m, sizeof(root_uuid)); - arg_data_what = strjoin("/dev/disk/by-partuuid/", id128_to_uuid_string(root_uuid, ids)); + arg_data_what = path_join("/dev/disk/by-partuuid", id128_to_uuid_string(root_uuid, ids)); if (!arg_data_what) return log_oom(); } @@ -196,7 +197,7 @@ static int determine_devices(void) { if (!arg_hash_what) { memcpy(&verity_uuid, (uint8_t*) m + l - sizeof(verity_uuid), sizeof(verity_uuid)); - arg_hash_what = strjoin("/dev/disk/by-partuuid/", id128_to_uuid_string(verity_uuid, ids)); + arg_hash_what = path_join("/dev/disk/by-partuuid", id128_to_uuid_string(verity_uuid, ids)); if (!arg_hash_what) return log_oom(); } |