38 files changed, 9 insertions, 9 deletions
diff --git a/hwdb/.gitattributes b/hwdb.d/.gitattributes
index 830cae66c7..830cae66c7 100644
--- a/hwdb/.gitattributes
+++ b/hwdb.d/.gitattributes
diff --git a/hwdb/.gitignore b/hwdb.d/.gitignore
index c9a78a8c02..c9a78a8c02 100644
--- a/hwdb/.gitignore
+++ b/hwdb.d/.gitignore
diff --git a/hwdb/20-OUI.hwdb b/hwdb.d/20-OUI.hwdb
index 6ef84b4416..6ef84b4416 100644
--- a/hwdb/20-OUI.hwdb
+++ b/hwdb.d/20-OUI.hwdb
diff --git a/hwdb/20-acpi-vendor.hwdb b/hwdb.d/20-acpi-vendor.hwdb
index 2ac0db3a99..2ac0db3a99 100644
--- a/hwdb/20-acpi-vendor.hwdb
+++ b/hwdb.d/20-acpi-vendor.hwdb
diff --git a/hwdb/20-acpi-vendor.hwdb.patch b/hwdb.d/20-acpi-vendor.hwdb.patch
index edccae1ebc..edccae1ebc 100644
--- a/hwdb/20-acpi-vendor.hwdb.patch
+++ b/hwdb.d/20-acpi-vendor.hwdb.patch
diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb.d/20-bluetooth-vendor-product.hwdb
index 9cba3bfc05..9cba3bfc05 100644
--- a/hwdb/20-bluetooth-vendor-product.hwdb
+++ b/hwdb.d/20-bluetooth-vendor-product.hwdb
diff --git a/hwdb/20-net-ifname.hwdb b/hwdb.d/20-net-ifname.hwdb
index 2408dc172f..2408dc172f 100644
--- a/hwdb/20-net-ifname.hwdb
+++ b/hwdb.d/20-net-ifname.hwdb
diff --git a/hwdb/20-pci-classes.hwdb b/hwdb.d/20-pci-classes.hwdb
index b81fa2c3c4..b81fa2c3c4 100644
--- a/hwdb/20-pci-classes.hwdb
+++ b/hwdb.d/20-pci-classes.hwdb
diff --git a/hwdb/20-pci-vendor-model.hwdb b/hwdb.d/20-pci-vendor-model.hwdb
index b6588f0ae6..b6588f0ae6 100644
--- a/hwdb/20-pci-vendor-model.hwdb
+++ b/hwdb.d/20-pci-vendor-model.hwdb
diff --git a/hwdb/20-sdio-classes.hwdb b/hwdb.d/20-sdio-classes.hwdb
index eceb773ae3..3bf56bbf90 100644
--- a/hwdb/20-sdio-classes.hwdb
+++ b/hwdb.d/20-sdio-classes.hwdb
@@ -1,6 +1,6 @@
 # This file is part of systemd.
 #
-# Data imported from: hwdb/sdio.ids
+# Data imported from: hwdb.d/sdio.ids
 
 sdio:c00v*d*
  ID_SDIO_CLASS_FROM_DATABASE=Non-standard SDIO interface
diff --git a/hwdb/20-sdio-vendor-model.hwdb b/hwdb.d/20-sdio-vendor-model.hwdb
index 489dab433e..8d3e72439a 100644
--- a/hwdb/20-sdio-vendor-model.hwdb
+++ b/hwdb.d/20-sdio-vendor-model.hwdb
@@ -1,6 +1,6 @@
 # This file is part of systemd.
 #
-# Data imported from: hwdb/sdio.ids
+# Data imported from: hwdb.d/sdio.ids
 
 sdio:c*v0020*
  ID_VENDOR_FROM_DATABASE=ST-Ericsson
diff --git a/hwdb/20-usb-classes.hwdb b/hwdb.d/20-usb-classes.hwdb
index 418d39bb84..418d39bb84 100644
--- a/hwdb/20-usb-classes.hwdb
+++ b/hwdb.d/20-usb-classes.hwdb
diff --git a/hwdb/20-usb-vendor-model.hwdb b/hwdb.d/20-usb-vendor-model.hwdb
index 8718306c63..8718306c63 100644
--- a/hwdb/20-usb-vendor-model.hwdb
+++ b/hwdb.d/20-usb-vendor-model.hwdb
diff --git a/hwdb/20-vmbus-class.hwdb b/hwdb.d/20-vmbus-class.hwdb
index ba96b383a9..ba96b383a9 100644
--- a/hwdb/20-vmbus-class.hwdb
+++ b/hwdb.d/20-vmbus-class.hwdb
diff --git a/hwdb/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb
index 5142ef16c3..5142ef16c3 100644
--- a/hwdb/60-evdev.hwdb
+++ b/hwdb.d/60-evdev.hwdb
diff --git a/hwdb/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb
index 20c1e7ea0d..20c1e7ea0d 100644
--- a/hwdb/60-input-id.hwdb
+++ b/hwdb.d/60-input-id.hwdb
diff --git a/hwdb/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
index 15f0a970b6..15f0a970b6 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
diff --git a/hwdb/60-sensor.hwdb b/hwdb.d/60-sensor.hwdb
index 4d8e21f169..4d8e21f169 100644
--- a/hwdb/60-sensor.hwdb
+++ b/hwdb.d/60-sensor.hwdb
diff --git a/hwdb/70-joystick.hwdb b/hwdb.d/70-joystick.hwdb
index 9d5c4fc069..9d5c4fc069 100644
--- a/hwdb/70-joystick.hwdb
+++ b/hwdb.d/70-joystick.hwdb
diff --git a/hwdb/70-mouse.hwdb b/hwdb.d/70-mouse.hwdb
index 428922d2c8..428922d2c8 100644
--- a/hwdb/70-mouse.hwdb
+++ b/hwdb.d/70-mouse.hwdb
diff --git a/hwdb/70-pointingstick.hwdb b/hwdb.d/70-pointingstick.hwdb
index c5c7dd9725..c5c7dd9725 100644
--- a/hwdb/70-pointingstick.hwdb
+++ b/hwdb.d/70-pointingstick.hwdb
diff --git a/hwdb/70-touchpad.hwdb b/hwdb.d/70-touchpad.hwdb
index 8194d98358..8194d98358 100644
--- a/hwdb/70-touchpad.hwdb
+++ b/hwdb.d/70-touchpad.hwdb
diff --git a/hwdb/acpi-update.py b/hwdb.d/acpi-update.py
index 7bdd3f93d8..7bdd3f93d8 100755
--- a/hwdb/acpi-update.py
+++ b/hwdb.d/acpi-update.py
diff --git a/hwdb/acpi_id_registry.html b/hwdb.d/acpi_id_registry.html
index 9830753831..9830753831 100644
--- a/hwdb/acpi_id_registry.html
+++ b/hwdb.d/acpi_id_registry.html
diff --git a/hwdb/ids_parser.py b/hwdb.d/ids_parser.py
index 58ecc73ae1..6f3a88f840 100755
--- a/hwdb/ids_parser.py
+++ b/hwdb.d/ids_parser.py
@@ -275,7 +275,7 @@ def sdio_vendor_model(p):
             add_item(items, (vendor, device), text)
 
     with open('20-sdio-vendor-model.hwdb', 'wt') as out:
-        header(out, 'hwdb/sdio.ids')
+        header(out, 'hwdb.d/sdio.ids')
 
         for key in sorted(items):
             if len(key) == 1:
@@ -296,7 +296,7 @@ def sdio_classes(p):
         add_item(items, klass, text)
 
     with open('20-sdio-classes.hwdb', 'wt') as out:
-        header(out, 'hwdb/sdio.ids')
+        header(out, 'hwdb.d/sdio.ids')
 
         for klass in sorted(items):
             print(f'',
diff --git a/hwdb/ma-large.txt b/hwdb.d/ma-large.txt
index 302d12fab1..302d12fab1 100644
--- a/hwdb/ma-large.txt
+++ b/hwdb.d/ma-large.txt
diff --git a/hwdb/ma-medium.txt b/hwdb.d/ma-medium.txt
index 5d255daaf1..5d255daaf1 100644
--- a/hwdb/ma-medium.txt
+++ b/hwdb.d/ma-medium.txt
diff --git a/hwdb/ma-small.txt b/hwdb.d/ma-small.txt
index 9420f18ef3..9420f18ef3 100644
--- a/hwdb/ma-small.txt
+++ b/hwdb.d/ma-small.txt
diff --git a/hwdb/meson.build b/hwdb.d/meson.build
index 31ee3e7409..31ee3e7409 100644
--- a/hwdb/meson.build
+++ b/hwdb.d/meson.build
diff --git a/hwdb/parse_hwdb.py b/hwdb.d/parse_hwdb.py
index da0bca5c5d..da0bca5c5d 100755
--- a/hwdb/parse_hwdb.py
+++ b/hwdb.d/parse_hwdb.py
diff --git a/hwdb/pci.ids b/hwdb.d/pci.ids
index 7a7da5c192..7a7da5c192 100644
--- a/hwdb/pci.ids
+++ b/hwdb.d/pci.ids
diff --git a/hwdb/pnp_id_registry.html b/hwdb.d/pnp_id_registry.html
index 155ab3c882..155ab3c882 100644
--- a/hwdb/pnp_id_registry.html
+++ b/hwdb.d/pnp_id_registry.html
diff --git a/hwdb/sdio.ids b/hwdb.d/sdio.ids
index 9c706c0ea2..9c706c0ea2 100644
--- a/hwdb/sdio.ids
+++ b/hwdb.d/sdio.ids
diff --git a/hwdb/usb.ids b/hwdb.d/usb.ids
index 7d136519fb..7d136519fb 100644
--- a/hwdb/usb.ids
+++ b/hwdb.d/usb.ids
diff --git a/meson.build b/meson.build
index 763ff55dd4..1e27be7837 100644
--- a/meson.build
+++ b/meson.build
@@ -2907,12 +2907,12 @@ make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
 
-subdir('units')
 subdir('sysctl.d')
 subdir('sysusers.d')
 subdir('tmpfiles.d')
+subdir('hwdb.d')
+subdir('units')
 subdir('presets')
-subdir('hwdb')
 subdir('network')
 subdir('man')
 subdir('shell-completion/bash')
diff --git a/test/hwdb-test.sh b/test/hwdb-test.sh
index 05363e9ad6..d12f82fa2d 100755
--- a/test/hwdb-test.sh
+++ b/test/hwdb-test.sh
@@ -21,7 +21,7 @@ fi
 D=$(mktemp --directory)
 trap "rm -rf '$D'" EXIT INT QUIT PIPE
 mkdir -p "$D/etc/udev"
-ln -s "$ROOTDIR/hwdb" "$D/etc/udev/hwdb.d"
+ln -s "$ROOTDIR/hwdb.d" "$D/etc/udev/hwdb.d"
 
 # Test "good" properties" — no warnings or errors allowed
 err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
@@ -42,7 +42,7 @@ fi
 # Test "bad" properties" — warnings required, errors not allowed
 rm -f "$D/etc/udev/hwdb.bin" "$D/etc/udev/hwdb.d"
 
-ln -s "$ROOTDIR/test/hwdb" "$D/etc/udev/hwdb.d"
+ln -s "$ROOTDIR/test/hwdb.d" "$D/etc/udev/hwdb.d"
 err=$("$SYSTEMD_HWDB" update --root "$D" 2>&1 >/dev/null) && rc= || rc=$?
 if [ -n "$rc" ]; then
     echo "$SYSTEMD_HWDB returned $rc"
diff --git a/test/hwdb/10-bad.hwdb b/test/hwdb.d/10-bad.hwdb
index 0e1e147323..0e1e147323 100644
--- a/test/hwdb/10-bad.hwdb
+++ b/test/hwdb.d/10-bad.hwdb
diff --git a/test/meson.build b/test/meson.build
index 36d9df729c..24ab4d1dee 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -26,7 +26,7 @@ test_data_files = '''
         h.service
         hello-after-sleep.target
         hello.service
-        hwdb/10-bad.hwdb
+        hwdb.d/10-bad.hwdb
         i.service
         journal-data/journal-1.txt
         journal-data/journal-2.txt