Fix activate xorg.service failed

If "Type=forking" specified in systemd service file, then systemd
expected that the father process which invoke fork() will exit soon, in
the start timeout. Otherwise, this service will be treated as fail to
start.

Since xorg-launch-helper didn't exit after start Xorg, so it will
timeout, then the whole user session timed out.

Bug: https://bugs.tizen.org/jira/browse/TDIST-311
Change-Id: I48116acb6fb1f49838670f13a5c2ea2aa6145c84
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>

diff --git a/packaging/xorg-launch-helper.changes b/packaging/xorg-launch-helper.changes
index 315184c..7bac867 100644 (file)
--- a/packaging/xorg-launch-helper.changes
+++ b/packaging/xorg-launch-helper.changes
@@ -1,3 +1,6 @@
+* Web Sep 18 2013 Chengwei Yang <chengwei.yang@intel.com>
+- Fix activate xorg.service failed
+
 * Sat May 11 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130510.142059@d1bba9b
 - Set license using %license
 

diff --git a/xorg.service.in b/xorg.service.in
index 6fd6667..bb37001 100644 (file)
--- a/xorg.service.in
+++ b/xorg.service.in
@@ -17,7 +17,6 @@ Before=xorg.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/xorg
-Type=forking
 ExecStart=@prefix@/bin/xorg-launch-helper $OPTIONS
 Restart=always
 RestartSec=10