Commit ea3643d5 authored by Gabe Evans's avatar Gabe Evans Committed by Thomas Petazzoni
Browse files

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: default avatarGabe Evans <gabe@hashrabbit.co>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent b5dc580b

package/systemd/systemd.mk

+1 −7
Original line number Diff line number Diff line
@@ -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