aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-02-04 14:29:19 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-12 19:35:39 +0100
commitb6fcccb70ad14436b3b3f422f6511131988471b9 (patch)
tree4d62f2bd8063bc3c55a614fcab0796d950de3fda
parent57afda129b0784a605ef6c40e5e59f6faf0ef05d (diff)
downloadmeta-openembedded-contrib-b6fcccb70ad14436b3b3f422f6511131988471b9.tar.gz
meta-openembedded-contrib-b6fcccb70ad14436b3b3f422f6511131988471b9.tar.bz2
meta-openembedded-contrib-b6fcccb70ad14436b3b3f422f6511131988471b9.zip
xserver-nodm-init: only enable for runlevel 5
Runlevel 5 is traditionally graphical. If it starts in runlevel 2 or 3 systemd gets confused and adds it as a dependency of the multi-user target, not just the graphical target. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rwxr-xr-xmeta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm9
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb4
2 files changed, 11 insertions, 2 deletions
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
index d2e2f866c3..5d7e8a2f36 100755
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
@@ -1,4 +1,13 @@
#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: xserver
+# Required-Start: $local_fs $remote_fs dbus
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 5
+# Default-Stop: 0 1 2 3 6
+### END INIT INFO
+
. /etc/init.d/functions
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 47470fbfe1..f9bf007a42 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
@@ -15,8 +15,8 @@ S = "${WORKDIR}"
inherit allarch update-rc.d systemd
INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ."
-INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 5 . stop 01 0 1 2 3 6 ."
+INITSCRIPT_PARAMS_shr = "start 90 5 . stop 90 0 1 2 3 6 ."
do_install() {
install -d ${D}${sysconfdir}/init.d