summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Borleis <jbe@pengutronix.de>2016-06-07 20:13:59 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-06-13 17:10:44 +0200
commitd9782dc28da0275f5eb13e2b96d8297b920d740d (patch)
tree158097f178c5752a83bc13a0221f2727da0a4864
parent9396e7dad4dc23659447a04e85ffb0d7e52ff10f (diff)
downloadptxdist-d9782dc28da0275f5eb13e2b96d8297b920d740d.tar.gz
ptxdist-d9782dc28da0275f5eb13e2b96d8297b920d740d.tar.xz
systemd/udev: fix hardware database generating
Without this fix systemd fails at run-time with: systemd-hwdb-update.service - Rebuild Hardware Database Loaded: loaded (/lib/systemd/system/systemd-hwdb-update.service; static; vendor preset: enabled) Active: failed (Result: exit-code) since Tue 2016-06-07 15:45:38 UTC; 16min ago Condition: start condition failed at Tue 2016-06-07 15:45:55 UTC; 16min ago ConditionNeedsUpdate=/etc was not met Docs: man:hwdb(7) man:systemd-hwdb(8) Main PID: 413 (code=exited, status=203/EXEC) Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Main process exited, code=exited, status=203/EXEC Jun 07 15:45:38 qemu systemd[1]: Failed to start Rebuild Hardware Database. Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Unit entered failed state. Jun 07 15:45:38 qemu systemd[1]: systemd-hwdb-update.service: Failed with result 'exit-code'. Signed-off-by: Juergen Borleis <jbe@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/systemd.make2
-rw-r--r--rules/udev.make2
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/systemd.make b/rules/systemd.make
index 29ddbd84f..c5ac60843 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -156,7 +156,7 @@ $(STATEDIR)/systemd.install:
@$(call targetinfo)
@$(call world/install, SYSTEMD)
ifdef PTXCONF_UDEV_HWDB
- @systemd-hwdb update --root $(SYSTEMD_PKGDIR)
+ @systemd-hwdb update --usr --root $(SYSTEMD_PKGDIR)
endif
ifndef PTXCONF_SYSTEMD_VCONSOLE
@rm -v $(SYSTEMD_PKGDIR)/etc/systemd/system/getty.target.wants/getty@tty1.service
diff --git a/rules/udev.make b/rules/udev.make
index 2ad990b70..c6df5c5b9 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -186,7 +186,7 @@ ifdef PTXCONF_UDEV_ETC_CONF
@$(call install_alternative, udev, 0, 0, 0644, /etc/udev/udev.conf)
endif
ifdef PTXCONF_UDEV_HWDB
- @$(call install_copy, udev, 0, 0, 0644, -, /etc/udev/hwdb.bin)
+ @$(call install_copy, udev, 0, 0, 0644, -, /lib/udev/hwdb.bin)
endif
ifdef PTXCONF_UDEV_LEGACY