launching Xorg and enlightenment

Change-Id: Ieef88baaadbe5e3b1fab9e65eb8d4639e3a73872

diff --git a/packaging/x11-common.spec b/packaging/x11-common.spec
index 0db7f08..219768a 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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