Remove display system specific environment

We need the prelaunch daemon to run in both X and wayland environments,
so directly exporting DISPLAY or ELM_ENGINE in the service file will
not work.  Instead the service file will use the EnvironmentFile mechanism
to load a snippet (if the file exists).

Each vertical can create a /etc/sysconfig/wrt file containing key/value
pairs that needed for the specific environment.  This could be done in the
post section of a ks file or any other mechanism.Z

Change-Id: I8e14233595c6e992b718ae9dfa14077a026c657c

diff --git a/packaging/wrt.changes b/packaging/wrt.changes
index ad9db4a..e8cacc1 100644 (file)
--- a/packaging/wrt.changes
+++ b/packaging/wrt.changes
@@ -1,3 +1,6 @@
+* Mon Jul 15 2013 Rusty Lynch <rusty.lynch@intel.com> accepted/tizen/20130710.221131@da834c3
+- Remove display system specific environment
+
 * Tue Jul 09 2013 Baptiste DURAND <baptiste.durand@eurogiciel.fr> accepted/tizen/20130708.234009@378666e
 -  Fix memory leak
 

diff --git a/packaging/wrt_launchpad_daemon@.service b/packaging/wrt_launchpad_daemon@.service
index 5263799..1bc1eb6 100644 (file)
--- a/packaging/wrt_launchpad_daemon@.service
+++ b/packaging/wrt_launchpad_daemon@.service
@@ -3,8 +3,8 @@ Description=Start the wrt_launchpad_daemon
 After=ac.service
 
 [Service]
+EnvironmentFile=-/etc/sysconfig/wrt
 Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/%I/dbus/user_bus_socket
-Environment=DISPLAY=:0
 Environment=XDG_RUNTIME_DIR=/run/user/%I
 ExecStart=/usr/bin/wrt_launchpad_daemon "                                                                                                                                                                                                         "
 KillSignal=SIGKILL