shared: conf-files - add root parameter

[elogind.git] / src / udev / udevadm-hwdb.c

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 00c0d3d4c4ac5dba15aabc7782ec6651cda189b7..596a89b6400438d14507154875c44a4a7a8b0a5f 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -537,7 +537,7 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
                 }
                 trie->nodes_count++;
 
-                err = conf_files_list_strv(&files, ".hwdb", (const char **)conf_file_dirs);
+                err = conf_files_list_strv(&files, ".hwdb", NULL, (const char **)conf_file_dirs);
                 if (err < 0) {
                         log_error("failed to enumerate hwdb files: %s\n", strerror(-err));
                         rc = EXIT_FAILURE;
@@ -565,11 +565,10 @@ static int adm_hwdb(struct udev *udev, int argc, char *argv[]) {
                 log_debug("strings dedup'ed: %8zu bytes (%8zu)\n",
                           trie->strings->dedup_len, trie->strings->dedup_count);
 
-                mkdir_parents(HWDB_BIN, 0755);
-                err = trie_store(trie, HWDB_BIN);
+                mkdir_parents("/etc/udev/hwdb.bin", 0755);
+                err = trie_store(trie, "/etc/udev/hwdb.bin");
                 if (err < 0) {
-                        log_error("Failure writing hardware database '%s': %s",
-                                  HWDB_BIN, strerror(-err));
+                        log_error("Failure writing database /etc/udev/hwdb.bin: %s", strerror(-err));
                         rc = EXIT_FAILURE;
                 }
         }