[patch] systemd-udev-hwdb-move-lib-syslocal.patch

systemd-206-lib-syslocal-hwdb.patch (text/plain), 2.34 KB, created by Ulenrich on 2013-07-30 17:02:49 UTC

diff -r -u a/libudev/libudev-hwdb.c b/libudev/libudev-hwdb.c
--- a/libudev/libudev-hwdb.c	2013-07-02 00:24:16.000000000 +0200
+++ b/libudev/libudev-hwdb.c	2013-07-30 18:51:28.106609254 +0200
@@ -275,30 +275,30 @@
         hwdb->refcount = 1;
         udev_list_init(udev, &hwdb->properties_list, true);
 
-        hwdb->f = fopen("/etc/udev/hwdb.bin", "re");
+        hwdb->f = fopen("/lib/syslocal/hwdb.bin", "re");
         if (!hwdb->f) {
-                log_debug("error reading /etc/udev/hwdb.bin: %m");
+                log_debug("error reading /lib/syslocal/hwdb.bin: %m");
                 udev_hwdb_unref(hwdb);
                 return NULL;
         }
 
         if (fstat(fileno(hwdb->f), &hwdb->st) < 0 ||
             (size_t)hwdb->st.st_size < offsetof(struct trie_header_f, strings_len) + 8) {
-                log_debug("error reading /etc/udev/hwdb.bin: %m");
+                log_debug("error reading /lib/syslocal/hwdb.bin: %m");
                 udev_hwdb_unref(hwdb);
                 return NULL;
         }
 
         hwdb->map = mmap(0, hwdb->st.st_size, PROT_READ, MAP_SHARED, fileno(hwdb->f), 0);
         if (hwdb->map == MAP_FAILED) {
-                log_debug("error mapping /etc/udev/hwdb.bin: %m");
+                log_debug("error mapping /lib/syslocal/hwdb.bin: %m");
                 udev_hwdb_unref(hwdb);
                 return NULL;
         }
 
         if (memcmp(hwdb->map, sig, sizeof(hwdb->head->signature)) != 0 ||
             (size_t)hwdb->st.st_size != le64toh(hwdb->head->file_size)) {
-                log_debug("error recognizing the format of /etc/udev/hwdb.bin");
+                log_debug("error recognizing the format of /lib/syslocal/hwdb.bin");
                 udev_hwdb_unref(hwdb);
                 return NULL;
         }
diff -r -u a/udev/udevadm-hwdb.c b/udev/udevadm-hwdb.c
--- a/udev/udevadm-hwdb.c	2013-07-19 18:58:41.000000000 +0200
+++ b/udev/udevadm-hwdb.c	2013-07-30 18:49:42.073689451 +0200
@@ -628,7 +628,7 @@
                 log_debug("strings dedup'ed: %8zu bytes (%8zu)\n",
                           trie->strings->dedup_len, trie->strings->dedup_count);
 
-                if (asprintf(&hwdb_bin, "%s/etc/udev/hwdb.bin", root) < 0) {
+                if (asprintf(&hwdb_bin, "%s/lib/syslocal/hwdb.bin", root) < 0) {
                         rc = EXIT_FAILURE;
                         goto out;
                 }