summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Liu <net147@gmail.com>2014-05-26 22:15:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 11:05:31 +0100
commitc60886f9f5ce046da9259a2b2a9b907351dfc259 (patch)
tree7ce31a6b792ecb502a91a7c0012a433869645a23
parent3ceb90eacdcb7a38542edbe8856b55cfecc1d5a0 (diff)
downloadpoky-c60886f9f5ce046da9259a2b2a9b907351dfc259.tar.gz
poky-c60886f9f5ce046da9259a2b2a9b907351dfc259.tar.bz2
poky-c60886f9f5ce046da9259a2b2a9b907351dfc259.zip
consolekit: fix console-kit-log-system-start.service startup
console-kit-log-system-start.service fails to to start if the /var/log/ConsoleKit directory does not exist. Normally it is created automatically but as we mount a tmpfs at /var/log, we need to add a tmpfiles.d entry to create it. (From OE-Core master rev: 2a9a14bf400fe0c263c58aa85b02aba7311b1328) (From OE-Core rev: 305da37a4dc0fba2b8f3219cfae47a1d4228f244) Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index 63da028f81..ac5c37fd39 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -37,6 +37,12 @@ FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so"
RDEPENDS_pam-plugin-ck-connector += "${PN}"
do_install_append() {
+ if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+ install -d ${D}${sysconfdir}/tmpfiles.d
+ echo "d ${localstatedir}/log/ConsoleKit - - - -" \
+ > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf
+ fi
+
# Remove /var/run from package as console-kit-daemon will populate it on startup
rm -fr "${D}${localstatedir}/run"
}