mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Juergen Borleis <jbe@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] systemd/udev: fix hardware database generating
Date: Tue, 7 Jun 2016 20:13:59 +0200	[thread overview]
Message-ID: <201606072013.59404.jbe@pengutronix.de> (raw)

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>

diff --git a/rules/systemd.make b/rules/systemd.make
index 29ddbd84f793..c5ac60843dde 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 2ad990b70e56..c6df5c5b90fb 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

-- 
Pengutronix e.K.                              | Juergen Borleis             |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

             reply	other threads:[~2016-06-07 18:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-07 18:13 Juergen Borleis [this message]
2016-06-07 21:56 ` Ladislav Michl
2016-06-14  7:26 ` Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201606072013.59404.jbe@pengutronix.de \
    --to=jbe@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox