diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2015-02-04 14:29:19 -0600 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-12 19:35:39 +0100 |
commit | b6fcccb70ad14436b3b3f422f6511131988471b9 (patch) | |
tree | 4d62f2bd8063bc3c55a614fcab0796d950de3fda /meta-oe/recipes-graphics | |
parent | 57afda129b0784a605ef6c40e5e59f6faf0ef05d (diff) | |
download | meta-openembedded-b6fcccb70ad14436b3b3f422f6511131988471b9.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-graphics')
-rwxr-xr-x | meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm | 9 | ||||
-rw-r--r-- | meta-oe/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 d2e2f866c..5d7e8a2f3 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 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | # | ||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: xserver | ||
5 | # Required-Start: $local_fs $remote_fs dbus | ||
6 | # Required-Stop: $local_fs $remote_fs | ||
7 | # Default-Start: 5 | ||
8 | # Default-Stop: 0 1 2 3 6 | ||
9 | ### END INIT INFO | ||
10 | |||
2 | 11 | ||
3 | . /etc/init.d/functions | 12 | . /etc/init.d/functions |
4 | 13 | ||
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 47470fbfe..f9bf007a4 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}" | |||
15 | inherit allarch update-rc.d systemd | 15 | inherit allarch update-rc.d systemd |
16 | 16 | ||
17 | INITSCRIPT_NAME = "xserver-nodm" | 17 | INITSCRIPT_NAME = "xserver-nodm" |
18 | INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 0 1 6 ." | 18 | INITSCRIPT_PARAMS = "start 01 5 . stop 01 0 1 2 3 6 ." |
19 | INITSCRIPT_PARAMS_shr = "start 90 5 2 . stop 90 0 1 6 ." | 19 | INITSCRIPT_PARAMS_shr = "start 90 5 . stop 90 0 1 2 3 6 ." |
20 | 20 | ||
21 | do_install() { | 21 | do_install() { |
22 | install -d ${D}${sysconfdir}/init.d | 22 | install -d ${D}${sysconfdir}/init.d |