summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoram Park <boram1288.park@samsung.com>2014-08-22 15:16:40 +0900
committerBoram Park <boram1288.park@samsung.com>2014-08-22 15:19:58 +0900
commit16fe0e3e97763bb757a717f4c0ac9cc0bf9adc73 (patch)
tree729f2499ff9715985aa44aec09f1dfa935a521c7
parent0eda78b65a791d1bcf6475f55eb8fbb2ed3d9cef (diff)
downloadx11-common-16fe0e3e97763bb757a717f4c0ac9cc0bf9adc73.tar.gz
x11-common-16fe0e3e97763bb757a717f4c0ac9cc0bf9adc73.tar.bz2
x11-common-16fe0e3e97763bb757a717f4c0ac9cc0bf9adc73.zip
Change-Id: Ibe440e52e9340b5c4630de8c542d08ad84e289ae
-rw-r--r--packaging/x11-common.spec5
-rw-r--r--system/display-manager-run.service11
2 files changed, 12 insertions, 4 deletions
diff --git a/packaging/x11-common.spec b/packaging/x11-common.spec
index 334e4d2..1edfc98 100644
--- a/packaging/x11-common.spec
+++ b/packaging/x11-common.spec
@@ -32,9 +32,14 @@ mkdir -p %{buildroot}/usr/lib/systemd/system
mv %{buildroot}/display-manager.path %{buildroot}/usr/lib/systemd/system/
mv %{buildroot}/display-manager.service %{buildroot}/usr/lib/systemd/system/
mv %{buildroot}/display-manager-run.service %{buildroot}/usr/lib/systemd/system/
+mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
+ln -sf ../display-manager.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/display-manager.service
+ln -sf ../display-manager-run.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/display-manager-run.service
%files
%defattr(-,root,root,-)
/usr/lib/systemd/system/display-manager.path
/usr/lib/systemd/system/display-manager.service
/usr/lib/systemd/system/display-manager-run.service
+/usr/lib/systemd/system/multi-user.target.wants/display-manager.service
+/usr/lib/systemd/system/multi-user.target.wants/display-manager-run.service
diff --git a/system/display-manager-run.service b/system/display-manager-run.service
index 49148c8..eda918f 100644
--- a/system/display-manager-run.service
+++ b/system/display-manager-run.service
@@ -2,10 +2,13 @@
Description=Xorg display daemon
[Service]
-User=display
-ExecStart=/usr/bin/startx
-StandardInput=tty
-TTYPath=/dev/tty7
+#User=display
+Restart=always
+RestartSec=10
+Type=forking
+ExecStart=/usr/bin/Xorg -logfile /var/log/Xorg.0.log
+#StandardInput=tty
+#TTYPath=/dev/tty7
#adding the capability to configure ttys
#may be needed if the user 'display' doesn't own the tty