[oe-commits] Dan McGregor : xserver-nodm-init: only enable for runlevel 5

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: b6fcccb70ad14436b3b3f422f6511131988471b9
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=b6fcccb70ad14436b3b3f422f6511131988471b9

Author: Dan McGregor <dan.mcgregor at usask.ca>
Date:   Wed Feb  4 14:29:19 2015 -0600

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 at usask.ca>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm         | 9 +++++++++
 .../recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb  | 4 ++--
 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 d2e2f86..5d7e8a2 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 47470fb..f9bf007 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