Updated modello script and configuration for weston

Change-Id: Ia0cae21028637c8cd88c343b4d557bed5adf34ac
Signed-off-by: Imran Zaman <imran.zaman@intel.com>

diff --git a/data/tizen-ivi/etc/session.d/genivi-session-modello b/data/tizen-ivi/etc/session.d/genivi-session-modello
new file mode 100755 (executable)
index 0000000..eb8b009
--- /dev/null
+++ b/data/tizen-ivi/etc/session.d/genivi-session-modello
@@ -0,0 +1,9 @@
+#!/bin/sh
+#
+#WESTON_LAUNCH=/usr/bin/tlm-weston-launch
+WESTON_LAUNCH=weston-launch
+export WAYLAND_SERVER_DIR=/tmp
+export WAYLAND_SERVER_GROUP=weston-launch
+export WAYLAND_SERVER_MODE=0660
+export WESTON_CONFIG=/etc/xdg/weston/weston-genivi-modello.ini
+$WESTON_LAUNCH -- -i0 --log=/tmp/genivi-weston.log

diff --git a/data/tizen-ivi/etc/session.d/genivi-session-multiseat b/data/tizen-ivi/etc/session.d/genivi-session-multiseat
index 4d75a62..4d97f52 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/genivi-session-multiseat
+++ b/data/tizen-ivi/etc/session.d/genivi-session-multiseat
@@ -6,4 +6,4 @@ export WAYLAND_SERVER_DIR=/tmp
 export WAYLAND_SERVER_GROUP=weston-launch
 export WAYLAND_SERVER_MODE=0660
 export WESTON_CONFIG=/etc/xdg/weston/weston-genivi.ini
-$WESTON_LAUNCH -- -i0 --current-mode --log=/tmp/genivi-weston.log --shell=desktop-shell.so
+$WESTON_LAUNCH -- -i0 --log=/tmp/genivi-weston.log --shell=desktop-shell.so

diff --git a/data/tizen-ivi/etc/session.d/genivi-session-singleseat b/data/tizen-ivi/etc/session.d/genivi-session-singleseat
index 2adafdd..440edbe 100755 (executable)
--- a/data/tizen-ivi/etc/session.d/genivi-session-singleseat
+++ b/data/tizen-ivi/etc/session.d/genivi-session-singleseat
@@ -6,4 +6,4 @@ export WAYLAND_SERVER_DIR=/tmp
 export WAYLAND_SERVER_GROUP=weston-launch
 export WAYLAND_SERVER_MODE=0660
 export WESTON_CONFIG=/etc/xdg/weston/weston-genivi.ini
-$WESTON_LAUNCH -- -i0 --current-mode --log=/tmp/genivi-weston.log
+$WESTON_LAUNCH -- -i0 --log=/tmp/genivi-weston.log

diff --git a/data/tizen-ivi/etc/tlm-singleseat-modello.conf b/data/tizen-ivi/etc/tlm-singleseat-modello.conf
index 5296382..0369ae7 100644 (file)
--- a/data/tizen-ivi/etc/tlm-singleseat-modello.conf
+++ b/data/tizen-ivi/etc/tlm-singleseat-modello.conf
@@ -63,7 +63,7 @@ NSEATS=2
 DEFAULT_USER=genivi
 SETUP_TERMINAL=1
 VTNR=7
-SESSION_CMD=/etc/session.d/genivi-session-singleseat
+SESSION_CMD=/etc/session.d/genivi-session-modello
 DEFAULT_PAM_SERVICE=tlm-system-login
 SETUP_RUNTIME_DIR=1
 #

diff --git a/data/tizen-ivi/etc/xdg/weston/weston-genivi-modello.ini b/data/tizen-ivi/etc/xdg/weston/weston-genivi-modello.ini
new file mode 100644 (file)
index 0000000..8d0acfa
--- /dev/null
+++ b/data/tizen-ivi/etc/xdg/weston/weston-genivi-modello.ini
@@ -0,0 +1,42 @@
+[core]
+#modules=cms-colord.so
+shell=fullscreen-shell.so
+
+[shell]
+background-image=/usr/share/backgrounds/gnome/Aqua.jpg
+background-color=0xff248bd1
+background-type=tile
+panel-color=0xff2a3c4a
+locking=true
+animation=zoom
+startup-animation=fade
+
+[output]
+name=VGA1
+mode=off
+
+[output]
+name=DP1
+mode=1280x720@60.0
+transform=90
+
+#[output]
+#name=LVDS1
+#mode=1680x1050
+#transform=90
+#icc_profile=/usr/share/color/icc/colord/Bluish.icc
+
+#[output]
+#name=VGA1
+#mode=173.00  1920 2048 2248 2576  1080 1083 1088 1120 -hsync +vsync
+#transform=flipped
+
+#[output]
+#name=X1
+#mode=1024x768
+#transform=flipped-270
+
+#[touchpad]
+#constant_accel_factor = 50
+#min_accel_factor = 0.16
+#max_accel_factor = 1.0

diff --git a/data/tizen-ivi/weston-genivi-vtc1010.ini b/data/tizen-ivi/etc/xdg/weston/weston-genivi-vtc1010.ini
similarity index 100%
rename from data/tizen-ivi/weston-genivi-vtc1010.ini
rename to data/tizen-ivi/etc/xdg/weston/weston-genivi-vtc1010.ini

diff --git a/data/tizen-ivi/weston-genivi.ini b/data/tizen-ivi/etc/xdg/weston/weston-genivi.ini
similarity index 100%
rename from data/tizen-ivi/weston-genivi.ini
rename to data/tizen-ivi/etc/xdg/weston/weston-genivi.ini

diff --git a/data/tizen-ivi/weston-user-modello.ini b/data/tizen-ivi/etc/xdg/weston/weston-user-modello.ini
similarity index 89%
rename from data/tizen-ivi/weston-user-modello.ini
rename to data/tizen-ivi/etc/xdg/weston/weston-user-modello.ini
index 8a1902e..5ea66f3 100644 (file)
--- a/data/tizen-ivi/weston-user-modello.ini
+++ b/data/tizen-ivi/etc/xdg/weston/weston-user-modello.ini
@@ -15,6 +15,9 @@ panel-location=none
 [input-method]
 path=/bin/weekeyboard
 
+[keyboard]
+keymap_layout=wkb
+
 #[output]
 #name=LVDS1
 #mode=1680x1050
@@ -36,8 +39,8 @@ path=/bin/weekeyboard
 #min_accel_factor = 0.16
 #max_accel_factor = 1.0
 
-[output]
-name=DP1
-mode=1280x720@60
-transform=90
+#[output]
+#name=DP1
+#mode=1280x720@60
+#transform=90
 

diff --git a/data/tizen-ivi/weston-user.ini b/data/tizen-ivi/etc/xdg/weston/weston-user.ini
similarity index 100%
rename from data/tizen-ivi/weston-user.ini
rename to data/tizen-ivi/etc/xdg/weston/weston-user.ini

diff --git a/dists/rpm/tizen/packaging/tlm.spec b/dists/rpm/tizen/packaging/tlm.spec
index 4011e81..bf7da0f 100644 (file)
--- a/dists/rpm/tizen/packaging/tlm.spec
+++ b/dists/rpm/tizen/packaging/tlm.spec
@@ -183,7 +183,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
 install -m 755 -d %{buildroot}%{_sysconfdir}/xdg/weston
 install -m 644 data/tizen-ivi/etc/tlm*.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
-install -m 644 data/tizen-ivi/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
+install -m 644 data/tizen-ivi/etc/xdg/weston/*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 install -m 755 -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
 install -m 755 -d %{buildroot}%{_sysconfdir}/profile.d
@@ -374,9 +374,9 @@ fi
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
-%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
-%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 

diff --git a/packaging/tlm.spec b/packaging/tlm.spec
index 4011e81..bf7da0f 100644 (file)
--- a/packaging/tlm.spec
+++ b/packaging/tlm.spec
@@ -183,7 +183,7 @@ install -m 755 -d %{buildroot}%{_sysconfdir}/session.d
 install -m 755 -d %{buildroot}%{_sysconfdir}/xdg/weston
 install -m 644 data/tizen-ivi/etc/tlm*.conf %{buildroot}%{_sysconfdir}
 install -m 755 data/tizen-ivi/etc/session.d/* %{buildroot}%{_sysconfdir}/session.d/
-install -m 644 data/tizen-ivi/weston-*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
+install -m 644 data/tizen-ivi/etc/xdg/weston/*.ini %{buildroot}%{_sysconfdir}/xdg/weston/
 install -m 755 -d %{buildroot}%{_sysconfdir}/udev/rules.d
 install -m 644 data/tizen-ivi/10-multiseat-vtc1010.rules %{buildroot}%{_sysconfdir}/udev/rules.d/
 install -m 755 -d %{buildroot}%{_sysconfdir}/profile.d
@@ -374,9 +374,9 @@ fi
 %defattr(-,root,root,-)
 %manifest %{name}.manifest
 %config(noreplace) %{_sysconfdir}/tlm-singleseat-modello.conf
-%config(noreplace) %{_sysconfdir}/session.d/genivi-session-singleseat
+%config(noreplace) %{_sysconfdir}/session.d/genivi-session-modello
 %config(noreplace) %{_sysconfdir}/session.d/user-session-modello
-%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi.ini
+%config(noreplace) %{_sysconfdir}/xdg/weston/weston-genivi-modello.ini
 %config(noreplace) %{_sysconfdir}/xdg/weston/weston-user-modello.ini
 %config(noreplace) %{_sysconfdir}/profile.d/weston-env-ivi.sh
 

diff --git a/src/daemon/tlm-main.c b/src/daemon/tlm-main.c
index a887717..dfd92ec 100644 (file)
--- a/src/daemon/tlm-main.c
+++ b/src/daemon/tlm-main.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of tlm (Tizen Login Manager)
  *
- * Copyright (C) 2013-2014 Intel Corporation.
+ * Copyright (C) 2013-2015 Intel Corporation.
  *
  * Contact: Amarnath Valluri <amarnath.valluri@linux.intel.com>
  *          Jussi Laako <jussi.laako@linux.intel.com>
@@ -24,6 +24,9 @@
  * 02110-1301 USA
  */
 
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
 #include <glib.h>
 #include <gio/gio.h>
 #include <glib-unix.h>
@@ -51,7 +54,7 @@ _on_manager_stopped_cb (TlmManager *manager, gpointer user_data)
 static gboolean
 _on_sigterm_cb (gpointer data)
 {
-    DBG ("SIGTERM/SIGINT");
+    DBG ("SIGTERM");
 
     TlmManager *manager = TLM_MANAGER(data);
 
@@ -78,8 +81,10 @@ _on_sighup_cb (gpointer data)
 static void
 _setup_unix_signal_handlers (TlmManager *manager)
 {
+    if (signal (SIGINT, SIG_IGN) == SIG_ERR)
+        WARN ("failed ignore SIGINT: %s", strerror(errno));
+
     g_unix_signal_add (SIGTERM, _on_sigterm_cb, (gpointer) manager);
-    g_unix_signal_add (SIGINT, _on_sigterm_cb, (gpointer) manager);
     g_unix_signal_add (SIGHUP, _on_sighup_cb, (gpointer) manager);
 }
 

diff --git a/src/sessiond/main.c b/src/sessiond/main.c
index e0fa033..a8ab109 100644 (file)
--- a/src/sessiond/main.c
+++ b/src/sessiond/main.c
@@ -3,7 +3,7 @@
 /*
  * This file is part of tlm
  *
- * Copyright (C) 2014 Intel Corporation.
+ * Copyright (C) 2014-2015 Intel Corporation.
  *
  * Contact: Imran Zaman <imran.zaman@intel.com>
  *
@@ -28,6 +28,7 @@
 #include <signal.h>
 #include <string.h>
 #include <stdio.h>
+#include <errno.h>
 #include <glib-unix.h>
 #include <glib.h>
 #include <gio/gio.h>
@@ -37,7 +38,7 @@
 #include "tlm-session-daemon.h"
 
 static TlmSessionDaemon *_daemon = NULL;
-static guint _sig_source_id[3];
+static guint _sig_source_id[2];
 
 static void
 _on_daemon_closed (gpointer data, GObject *server)
@@ -65,6 +66,9 @@ _install_sighandlers (GMainLoop *main_loop)
     GSource *source = NULL;
     GMainContext *ctx = g_main_loop_get_context (main_loop);
 
+    if (signal (SIGINT, SIG_IGN) == SIG_ERR)
+        WARN ("failed to ignore SIGINT: %s", strerror(errno));
+
     source = g_unix_signal_source_new (SIGTERM);
     g_source_set_callback (source,
                            _handle_quit_signal,
@@ -72,19 +76,12 @@ _install_sighandlers (GMainLoop *main_loop)
                            NULL);
     _sig_source_id[0] = g_source_attach (source, ctx);
 
-    source = g_unix_signal_source_new (SIGINT);
-    g_source_set_callback (source,
-                           _handle_quit_signal,
-                           main_loop,
-                           NULL);
-    _sig_source_id[1] = g_source_attach (source, ctx);
-
     source = g_unix_signal_source_new (SIGHUP);
     g_source_set_callback (source,
                            _handle_quit_signal,
                            main_loop,
                            NULL);
-    _sig_source_id[2] = g_source_attach (source, ctx);
+    _sig_source_id[1] = g_source_attach (source, ctx);
 
     if (prctl(PR_SET_PDEATHSIG, SIGHUP))
         WARN ("failed to set parent death signal");

diff --git a/src/sessiond/tlm-session.c b/src/sessiond/tlm-session.c
index 3bbb401..afdaa1b 100644 (file)
--- a/src/sessiond/tlm-session.c
+++ b/src/sessiond/tlm-session.c
@@ -33,6 +33,7 @@
 #include <grp.h>
 #include <stdio.h>
 #include <signal.h>
+#include <errno.h>
 #include <termios.h>
 #include <libintl.h>
 #include <sys/types.h>
@@ -561,6 +562,7 @@ _exec_user_session (
     /* ==================================
      * this is child process here onwards
      * ================================== */
+
     gint open_max;
     gint fd;
 
@@ -568,7 +570,7 @@ _exec_user_session (
     open_max = sysconf (_SC_OPEN_MAX);
     for (fd = 3; fd < open_max; fd++) {
         if (fcntl (fd, F_SETFD, FD_CLOEXEC) < -1) {
-            WARN("Failed to close desriptor '%d', error: %s",
+            WARN ("Failed to close desriptor '%d', error: %s",
                 fd, strerror(errno));
         }
     }
@@ -687,6 +689,9 @@ _exec_user_session (
         args[1] = g_strdup ("--user");
     }
 
+    if (signal (SIGINT, SIG_DFL) == SIG_ERR)
+        WARN ("failed reset SIGINT: %s", strerror(errno));
+
     DBG ("executing: ");
     args_iter = args;
     while (args_iter && *args_iter) {