aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2014-11-24 08:32:49 -0600
committerDan McGregor <dan.mcgregor@usask.ca>2016-07-06 12:57:47 -0600
commitb9d80122503d5bca87dcf429c67e11a86d01b949 (patch)
tree9b01e9772197961a130b385fb6f8d5457e8c420c
parent73bbd31a427e06bb2a591cb028c12245f9d58669 (diff)
downloadmeta-openembedded-contrib-b9d80122503d5bca87dcf429c67e11a86d01b949.tar.gz
meta-openembedded-contrib-b9d80122503d5bca87dcf429c67e11a86d01b949.tar.bz2
meta-openembedded-contrib-b9d80122503d5bca87dcf429c67e11a86d01b949.zip
entrance: fix configuration
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-rw-r--r--meta-efl/recipes-efl/efl/entrance/entrance-conf.patch13
-rw-r--r--meta-efl/recipes-efl/efl/entrance/entrance.service3
-rw-r--r--meta-efl/recipes-efl/efl/entrance_svn.bb1
3 files changed, 16 insertions, 1 deletions
diff --git a/meta-efl/recipes-efl/efl/entrance/entrance-conf.patch b/meta-efl/recipes-efl/efl/entrance/entrance-conf.patch
new file mode 100644
index 0000000000..81b957fe64
--- /dev/null
+++ b/meta-efl/recipes-efl/efl/entrance/entrance-conf.patch
@@ -0,0 +1,13 @@
+Index: data/entrance.conf
+===================================================================
+--- entrance/data/entrance.conf (revision 82070)
++++ entrance/data/entrance.conf (working copy)
+@@ -4,7 +4,7 @@
+ /* X server path */
+ value "xinit_path" string: "/usr/bin/X";
+ /* X server args */
+- value "xinit_args" string: "-nolisten tcp -br vt7";
++ value "xinit_args" string: "-nolisten tcp vt7";
+
+ /* xauth path binary */
+ value "xauth_path" string: "/usr/bin/xauth";
diff --git a/meta-efl/recipes-efl/efl/entrance/entrance.service b/meta-efl/recipes-efl/efl/entrance/entrance.service
index 4828686952..9b472fe9b6 100644
--- a/meta-efl/recipes-efl/efl/entrance/entrance.service
+++ b/meta-efl/recipes-efl/efl/entrance/entrance.service
@@ -1,8 +1,9 @@
[Unit]
Description=Login manager for Enlightenment
+Conflicts=getty@tty7.service plymouth-quit.service
[Service]
-ExecStart=/usr/sbin/entrance
+ExecStart=/usr/sbin/entrance -n
[Install]
Alias=display-manager.service
diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb
index 2888dc8dc1..acc6685306 100644
--- a/meta-efl/recipes-efl/efl/entrance_svn.bb
+++ b/meta-efl/recipes-efl/efl/entrance_svn.bb
@@ -7,6 +7,7 @@ SECTION = "e/apps"
inherit e gettext systemd
SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \
file://0001-pam-use-common-auth-instead-of-system-auth.patch \
+ file://entrance-conf.patch \
file://entrance.service \
"
S = "${WORKDIR}/${SRCNAME}"