diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-09-24 20:11:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-09-30 13:02:29 +0200 |
| commit | 88bec2717557cd5c07bee68545133b996fc59609 (patch) | |
| tree | 3a02a12bd93042d9af28a7eb479bae33ea817cf4 | |
| parent | 2f41d19208b73faeccbca18b8258ab84cdcfd049 (diff) | |
| download | ptxdist-88bec2717557cd5c07bee68545133b996fc59609.tar.gz ptxdist-88bec2717557cd5c07bee68545133b996fc59609.tar.xz | |
dbus: no need to create /etc/machine-id if systemd is doing it
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/dbus.in | 6 | ||||
| -rw-r--r-- | rules/dbus.make | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/rules/dbus.in b/rules/dbus.in index 633099ea9..8b86b45dc 100644 --- a/rules/dbus.in +++ b/rules/dbus.in @@ -6,7 +6,7 @@ menuconfig DBUS select EXPAT if DBUS_XML_EXPAT select LIBXML2 if DBUS_XML_LIBXML2 select XORG_LIB_X11 if DBUS_X - select RC_ONCE if RUNTIME + select RC_ONCE if RUNTIME && DBUS_MACHINE_ID select LIBC_PTHREAD select LIBC_RT help @@ -26,6 +26,10 @@ menuconfig DBUS if DBUS +config DBUS_MACHINE_ID + bool + default !SYSTEMD + config DBUS_SELINUX prompt "selinux support [BROKEN]" depends on BROKEN diff --git a/rules/dbus.make b/rules/dbus.make index 968754538..e73240d70 100644 --- a/rules/dbus.make +++ b/rules/dbus.make @@ -105,8 +105,10 @@ $(STATEDIR)/dbus.targetinstall: @$(call install_lib, dbus, 0, 0, 0644, libdbus-1) +ifndef PTXCONF_DBUS_MACHINE_ID @$(call install_alternative, dbus, 0, 0, 0755, \ /etc/rc.once.d/dbus) +endif # # # # create system.d and event.d directories, which are used by the configuration and startup files |