summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2014-08-29 15:15:28 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-03 10:24:19 +0100
commit116b8a48f0d701d8f0b7807144ffdb708aad215e (patch)
treebc255c50869149a4ffbd979253e6f31d14bf1779
parentfbd068e23e16746d89c0bb60c96edd705da27a35 (diff)
downloadopenembedded-core-contrib-116b8a48f0d701d8f0b7807144ffdb708aad215e.tar.gz
openembedded-core-contrib-116b8a48f0d701d8f0b7807144ffdb708aad215e.tar.bz2
openembedded-core-contrib-116b8a48f0d701d8f0b7807144ffdb708aad215e.zip
xserver-nodm-init: Only start in runlevel 5
Runlevel 3 is often multi-user without X, so don't start the X server in runlevel 3. This allows one to start up a machine without X running from the bootloader. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb2
-rwxr-xr-xmeta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm4
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index 0a16ff5f83..b68d40e1be 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -47,6 +47,6 @@ do_install() {
RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}"
INITSCRIPT_NAME = "xserver-nodm"
-INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ."
SYSTEMD_SERVICE_${PN} = "xserver-nodm.service"
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
index f6692a814b..ef6c11c3f2 100755
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm
@@ -4,8 +4,8 @@
# Provides: xserver
# Required-Start: $local_fs $remote_fs dbus
# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 5
-# Default-Stop: 0 1 6
+# Default-Start: 5
+# Default-Stop: 0 1 2 3 6
### END INIT INFO
killproc() { # kill the named process(es)