aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-10-10 15:02:33 +0000
committerKoen Kooi <koen@dominion.thruhere.net>2011-10-11 22:43:18 +0200
commitd07327e6589de9f13fb91daa716728ac2306e3cd (patch)
treed7813d39dde3a0a0244ce61e3b79cb523e822c3e /meta-oe
parentd7f068e5244fc26227a0e01385f3f02e5bc102fe (diff)
downloadmeta-openembedded-contrib-d07327e6589de9f13fb91daa716728ac2306e3cd.tar.gz
xserver-nodm-init: exit 1 only if systemd is installed and use ${base_bindir}
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index d4a6b972fd..17fe4d8d8d 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SECTION = "x11"
-PR = "r9"
+PR = "r10"
SRC_URI = "file://xserver-nodm \
file://xserver-nodm.service \
@@ -31,12 +31,10 @@ INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
pkg_postinst_${PN}_append () {
- # can't do this offline
- if [ "x$D" != "x" ]; then
- exit 1
- fi
+ if [ -e ${base_bindir}/systemctl ] ; then
+ # can't do this offline
+ [ "x$D" != "x" ] && exit 1
- if [ -e /bin/systemctl ] ; then
systemctl enable xserver-nodm.service
fi
}