Modify xorg.service.in to support Tizen 2.2 releast

Change-Id: I1d14031b3386bb36bb25609be4c5adb38c5e2ef7

diff --git a/packaging/xorg-launch-helper.spec b/packaging/xorg-launch-helper.spec
index 5992097..1f1f301 100644 (file)
--- a/packaging/xorg-launch-helper.spec
+++ b/packaging/xorg-launch-helper.spec
@@ -1,6 +1,6 @@
 Name:          xorg-launch-helper
 Version:       4
-Release:       1
+Release:       2
 Summary:       Xorg service helper
 
 Group:         Graphics/X Window System
@@ -36,6 +36,12 @@ install -m 644 %{SOURCE1} %{buildroot}/etc/sysconfig/xorg
 install -m 0644 %{SOURCE2} %{buildroot}%{_prefix}/lib/systemd/user/
 ln -sf ../xorg_done.service %{buildroot}%{_prefix}/lib/systemd/user/xorg.target.wants
 
+# "-sharevt" option will be removed (only) for Tizen Emulator temporarily
+# by the request from Tizen SDK (kernel) team.
+%if 0%{?simulator}
+sed -i 's/-sharevts//g' %{buildroot}/etc/sysconfig/xorg
+%endif
+
 %files
 %manifest %{name}.manifest
 %license COPYING

diff --git a/xorg.service.in b/xorg.service.in
index 6ee5ce0..6cda38a 100644 (file)
--- a/xorg.service.in
+++ b/xorg.service.in
@@ -16,8 +16,10 @@ Description=Xorg server launch helper
 Before=xorg.target
 
 [Service]
-Type=notify
-ExecStart=@prefix@/bin/xorg-launch-helper :0 -nolisten tcp -noreset vt1
+EnvironmentFile=-/etc/sysconfig/xorg
+Type=forking
+OOMScoreAdjust=-1000
+ExecStart=@prefix@/bin/xorg-launch-helper $OPTIONS
 Restart=always
 RestartSec=10