diff options
| author | Boram Park <boram1288.park@samsung.com> | 2014-12-15 19:37:50 +0900 |
|---|---|---|
| committer | Boram Park <boram1288.park@samsung.com> | 2014-12-15 19:37:50 +0900 |
| commit | f560dcac4375632fb76234c71730aa629a90866d (patch) | |
| tree | b7f689afd71b089b898889f17e76a1a4660a9c89 | |
| parent | 73e0c95d6092e8721bc262a216cf1fd6c2194c4b (diff) | |
| download | x11-common-f560dcac4375632fb76234c71730aa629a90866d.tar.gz x11-common-f560dcac4375632fb76234c71730aa629a90866d.tar.bz2 x11-common-f560dcac4375632fb76234c71730aa629a90866d.zip | |
launching Xorg and enlightenmentsubmit/tizen_wearable/20141216.071502submit/tizen_tv/20141215.145745submit/tizen_mobile/20141216.071453submit/tizen_common/20141216.071438accepted/tizen/wearable/20141217.054236accepted/tizen/tv/20141217.013225accepted/tizen/mobile/20141217.053558accepted/tizen/common/20141217.104750tizen_3.0.2015.q1_commontizen_3.0.2014.q4_common
Change-Id: Ieef88baaadbe5e3b1fab9e65eb8d4639e3a73872
| -rw-r--r-- | packaging/x11-common.spec | 1 | ||||
| -rw-r--r-- | system/display-manager-run.service | 15 | ||||
| -rw-r--r-- | system/display-manager.service | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/packaging/x11-common.spec b/packaging/x11-common.spec index 0db7f08..219768a 100644 --- a/packaging/x11-common.spec +++ b/packaging/x11-common.spec @@ -8,6 +8,7 @@ License: MIT Source: %{name}-%{version}.tar.gz Requires: xorg-server +Requires: xorg-launch-helper Conflicts: weston-common %description diff --git a/system/display-manager-run.service b/system/display-manager-run.service index 52e0231..679b8a0 100644 --- a/system/display-manager-run.service +++ b/system/display-manager-run.service @@ -1,17 +1,16 @@ [Unit] Description=Xorg display daemon +Requires=dbus.service +After=dbus.service [Service] -#User=display +Type=notify Restart=always RestartSec=10 -ExecStart=/usr/bin/Xorg -logfile /var/log/Xorg.0.log -noreset -configdir /etc/X11/xorg.conf.d -#StandardInput=tty -#TTYPath=/dev/tty7 - -#adding the capability to configure ttys -#may be needed if the user 'display' doesn't own the tty -#CapabilityBoundingSet=CAP_SYS_TTY_CONFIG +EnvironmentFile=-/etc/sysconfig/xorg +ExecStart=/usr/bin/xorg-launch-helper $OPTIONS +StandardInput=tty +TTYPath=/dev/tty7 [Install] WantedBy=graphical.target diff --git a/system/display-manager.service b/system/display-manager.service index 39d7162..89a9c46 100644 --- a/system/display-manager.service +++ b/system/display-manager.service @@ -1,7 +1,7 @@ [Unit] Description=Display manager setup service -Requires=display-manager-run.service -After=display-manager-run.service +Requires=enlightenment.service +After=enlightenment.service [Service] Type=oneshot |