summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-02-04 14:29:22 -0600
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-12 19:35:39 +0100
commit496a5489380899defa78bfbf0a11b79da3692b3b (patch)
tree48ceb915374b0129426788927ea15cff070fa945
parent07534189891ea8e8b61c86238181a4d53a18c904 (diff)
downloadmeta-openembedded-496a5489380899defa78bfbf0a11b79da3692b3b.tar.gz
gdm: Only start in 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-gnome/recipes-gnome/gdm/gdm/gdm4
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm
index 43eae9517..bb5b41864 100755
--- a/meta-gnome/recipes-gnome/gdm/gdm/gdm
+++ b/meta-gnome/recipes-gnome/gdm/gdm/gdm
@@ -4,8 +4,8 @@
4# Should-Start: console-screen acpid dbus hal network-manager 4# Should-Start: console-screen acpid dbus hal network-manager
5# Required-Start: $local_fs $remote_fs 5# Required-Start: $local_fs $remote_fs
6# Required-Stop: $local_fs $remote_fs 6# Required-Stop: $local_fs $remote_fs
7# Default-Start: 2 3 4 5 7# Default-Start: 5
8# Default-Stop: 0 1 6 8# Default-Stop: 0 1 2 3 6
9# Short-Description: GNOME Display Manager 9# Short-Description: GNOME Display Manager
10# Description: Debian init script for the GNOME Display Manager 10# Description: Debian init script for the GNOME Display Manager
11### END INIT INFO 11### END INIT INFO
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index b2ae9ac07..fcd51ff3a 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -88,7 +88,7 @@ RCONFLICTS_${PN} += "${PN}-systemd"
88SYSTEMD_SERVICE_${PN} = "gdm.service" 88SYSTEMD_SERVICE_${PN} = "gdm.service"
89 89
90INITSCRIPT_NAME = "gdm" 90INITSCRIPT_NAME = "gdm"
91INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." 91INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 2 3 6 ."
92 92
93USERADD_PACKAGES = "${PN}" 93USERADD_PACKAGES = "${PN}"
94USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" 94USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm"