summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabe Evans <gabe@hashrabbit.co>2016-02-10 23:44:03 +0000
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-02-14 23:41:13 +0100
commitea3643d5695a948420a70b76b718bd98a2305a6a (patch)
tree8110a96459192e3980864c1468b496d171b72572
parentb5dc580b158f4790197843de1b2128025f83a0c0 (diff)
downloadbuildroot-ea3643d5695a948420a70b76b718bd98a2305a6a.tar.gz
buildroot-ea3643d5695a948420a70b76b718bd98a2305a6a.zip
systemd: fix dbus activation
Various DBus activated services fail to start with errors similar to: Unit dbus-org.freedesktop.hostname1.service failed to load: File exists. The message itself is rather vague and can be seen as a warning in systemd-networkd logs. Meanwhile, tools like hostnamectl don't work at all. The post-install target hook SYSTEMD_SANITIZE_PATH_IN_UNITS was replacing symlinks with duplicate files. The find command could have used -type f to avoid this but I instead chose to remove the hook since this fix doesn't seem to be needed anymore. Signed-off-by: Gabe Evans <gabe@hashrabbit.co> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/systemd/systemd.mk8
1 files changed, 1 insertions, 7 deletions
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index e4320697f6..23409631dc 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -150,16 +150,10 @@ define SYSTEMD_INSTALL_MACHINEID_HOOK
touch $(TARGET_DIR)/etc/machine-id
endef
-define SYSTEMD_SANITIZE_PATH_IN_UNITS
- find $(TARGET_DIR)/lib/systemd/system -name '*.service' \
- -exec $(SED) 's,$(HOST_DIR),,g' {} \;
-endef
-
SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
SYSTEMD_INSTALL_INIT_HOOK \
SYSTEMD_INSTALL_MACHINEID_HOOK \
- SYSTEMD_INSTALL_RESOLVCONF_HOOK \
- SYSTEMD_SANITIZE_PATH_IN_UNITS
+ SYSTEMD_INSTALL_RESOLVCONF_HOOK
define SYSTEMD_USERS
systemd-journal -1 systemd-journal -1 * /var/log/journal - - Journal
OpenPOWER on IntegriCloud