summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/x11-common.spec1
-rw-r--r--system/display-manager-run.service15
-rw-r--r--system/display-manager.service4
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