[Bug Fix] TC-2000 - Tlm default login doesn't work

This fix provides the right tlm configuration for Tizen.

Change-Id: Icf0d132c547029f67d74bea6e98b3b3894dc4843
Signed-off-by: Amarnath Valluri <amarnath.valluri@linux.intel.com>

diff --git a/data/tlm.service b/data/tlm.service
index 933ba1f..bc1135a 100644 (file)
--- a/data/tlm.service
+++ b/data/tlm.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Tizen Login Manager
 After=systemd-user-sessions.service systemd-logind.service
-Requires=systemd-logind.service
+Requires=multi-user.target
 
 [Service]
 ExecStart=/usr/bin/tlm

diff --git a/packaging/tlm.conf b/packaging/tlm.conf
new file mode 100644 (file)
index 0000000..9bdb913
--- /dev/null
+++ b/packaging/tlm.conf
@@ -0,0 +1,58 @@
+#
+# TLM configuration for Tizen(IVI).
+#
+
+#
+# This group contains top-level settings.
+#
+[General]
+#
+# Name of the account plugin to use to manage(add/remove) guest user accounts
+ACCOUNTS_PLUGIN=gumd
+#
+# Number of seats
+# Default: obtain from systemd
+#NSEATS=2
+#
+# Auto-login default user
+AUTO_LOGIN=1
+#
+# Prepare default/guest users before auto-login
+# Default: off
+# PREPARE_DEFAULT=0
+#
+# PAM service file to use
+PAM_SERVICE=tlm-login
+#
+# PAM service file for default user
+DEFAULT_PAM_SERVICE=tlm-default-login
+#
+# Default (guest) username or template to use
+#  %S - seat number
+#  %I - seat id string
+# Default: "guest"
+DEFAULT_USER=guest_%S
+#
+# Session command : The command run after successfull login
+SESSION_CMD=/usr/bin/weston-launch
+#
+# Session termination timeout in seconds
+# Default: 10
+#TERMINATE_TIMEOUT=10
+#
+# Setup terminal for session
+# Default: off
+#SETUP_TERMINAL=1
+#
+# Specify session type, needs to be specified for
+# XDG_SESSION_CLASS and XDG_SESSION_TYPE to be set
+SESSION_TYPE=wayland
+#
+#
+# Seat specific settings where the group name is seat id
+[seat0]
+DEFAULT_USER=app
+SETUP_TERMINAL=1
+SETUP_RUNTIME_DIR=1
+VTNR=7
+

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index f0f82f6..fb9f4be 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -11,6 +11,7 @@ License: LGPL-2.1+
 Source: %{name}-%{version}.tar.gz
 URL: https://github.com/01org/tlm
 Source1001: %{name}.manifest
+Source1002: %{name}.conf
 Requires(post): /sbin/ldconfig, systemd
 Requires(postun): /sbin/ldconfig, systemd
 Requires: gumd
@@ -55,11 +56,11 @@ Requires:   %{name} = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{version}
 cp %{SOURCE1001} .
+cp %{SOURCE1002} .
 
 
 %build
 %if %{debug_build} == 1
-./autogen.sh
 %configure --enable-gum --enable-gtk-doc --enable-examples --enable-debug
 %else
 %configure --enable-gum --enable-examples
@@ -76,6 +77,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 data/tlm-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-default-login %{buildroot}%{_sysconfdir}/pam.d/
 install -m 644 data/tlm-system-login %{buildroot}%{_sysconfdir}/pam.d/
+install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}/
 
 
 %post

diff --git a/src/sessiond/tlm-session.c b/src/sessiond/tlm-session.c
index 6011243..abc10dd 100644 (file)
--- a/src/sessiond/tlm-session.c
+++ b/src/sessiond/tlm-session.c
@@ -746,7 +746,7 @@ tlm_session_start (TlmSession *session,
         session_type = tlm_config_get_string (priv->config,
                                               TLM_CONFIG_GENERAL,
                                               TLM_CONFIG_GENERAL_SESSION_TYPE);
-    if (!tlm_config_has_key (priv->config,
+    if (tlm_config_has_key (priv->config,
                             TLM_CONFIG_GENERAL,
                             TLM_CONFIG_GENERAL_NSEATS))
         tlm_auth_session_putenv (priv->auth_session,