diff options
| author | Dan McGregor <dan.mcgregor@usask.ca> | 2014-08-29 15:15:28 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-03 11:09:03 +0100 |
| commit | 2b83ffee3db27400ef538319dd23268c6c9b168e (patch) | |
| tree | 2a0843ad2728d9ae88ffa9a4b32a9a89e53b6aa3 | |
| parent | e04230bf72eae50b5f4382acd66323c704d32b42 (diff) | |
| download | poky-2b83ffee3db27400ef538319dd23268c6c9b168e.tar.gz | |
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.
(From OE-Core rev: 116b8a48f0d701d8f0b7807144ffdb708aad215e)
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.bb | 2 | ||||
| -rwxr-xr-x | meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm | 4 |
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() { | |||
| 47 | RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" | 47 | RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" |
| 48 | 48 | ||
| 49 | INITSCRIPT_NAME = "xserver-nodm" | 49 | INITSCRIPT_NAME = "xserver-nodm" |
| 50 | INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." | 50 | INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." |
| 51 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" | 51 | SYSTEMD_SERVICE_${PN} = "xserver-nodm.service" |
| 52 | 52 | ||
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 @@ | |||
| 4 | # Provides: xserver | 4 | # Provides: xserver |
| 5 | # Required-Start: $local_fs $remote_fs dbus | 5 | # Required-Start: $local_fs $remote_fs dbus |
| 6 | # Required-Stop: $local_fs $remote_fs | 6 | # Required-Stop: $local_fs $remote_fs |
| 7 | # Default-Start: 2 5 | 7 | # Default-Start: 5 |
| 8 | # Default-Stop: 0 1 6 | 8 | # Default-Stop: 0 1 2 3 6 |
| 9 | ### END INIT INFO | 9 | ### END INIT INFO |
| 10 | 10 | ||
| 11 | killproc() { # kill the named process(es) | 11 | killproc() { # kill the named process(es) |
