diff options
| author | Michael Biebl <mbiebl@gmail.com> | 2017-06-01 03:21:11 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-06-01 03:21:11 +0200 |
| commit | 0aac506b64dd6102374635290ca979b080d1192f (patch) | |
| tree | 1b55e4952c5a130cc42118de70a3d3db9f42c96e /src/hwdb | |
| parent | Merge pull request #6053 from keszybz/doc-tweaks (diff) | |
| download | systemd-0aac506b64dd6102374635290ca979b080d1192f.tar.xz systemd-0aac506b64dd6102374635290ca979b080d1192f.zip | |
hwdb: use path_join() to generate the hwdb_bin path (#6063)
This avoids having double slashes which can confuse selinux.
Diffstat (limited to 'src/hwdb')
| -rw-r--r-- | src/hwdb/hwdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index a9539c812a..793398ca68 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -31,6 +31,7 @@ #include "hwdb-util.h" #include "label.h" #include "mkdir.h" +#include "path-util.h" #include "selinux-util.h" #include "strbuf.h" #include "string-util.h" @@ -670,7 +671,7 @@ static int hwdb_update(int argc, char *argv[], void *userdata) { log_debug("strings dedup'ed: %8zu bytes (%8zu)", trie->strings->dedup_len, trie->strings->dedup_count); - hwdb_bin = strjoin(arg_root, "/", arg_hwdb_bin_dir, "/hwdb.bin"); + hwdb_bin = path_join(arg_root, arg_hwdb_bin_dir, "hwdb.bin"); if (!hwdb_bin) return -ENOMEM; |