summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuke Kok <auke-jan.h.kok@intel.com>2012-04-23 10:37:11 -0700
committerAuke Kok <auke-jan.h.kok@intel.com>2012-04-23 10:37:11 -0700
commite44329cfd7cec25aa9b23cbf2798427172070946 (patch)
treeb3cf40c9a3e1b5a68e7b137da20182d79ad7dbe2
parent8303bf17f90ed214c20acfbb4e917d55eae56576 (diff)
downloadxorg-launch-helper-e44329cfd7cec25aa9b23cbf2798427172070946.tar.gz
xorg-launch-helper-e44329cfd7cec25aa9b23cbf2798427172070946.tar.bz2
xorg-launch-helper-e44329cfd7cec25aa9b23cbf2798427172070946.zip
Initial commit of xorg-launch-helper.
There is not much left of uxlaunch OR user-session. After careful testing, we can do almost all the bits that we need in systemd without any more code than this. The last remaining bit missing is Xorg startup synchronization. To start a desktop session with X applications, we need to assure that Xorg is ready before forking services that require an active $DISPLAY server. This code comes all the way from uxlaunch and discards Xauth support, and just includes the bits needed to start Xorg and wait for it to signal that it is ready to accept and paint pixels for us. At that point, it exits and thus tells systemd that the service is operational. ;################################################################### ; ; THIS ENDS THE HISTORY FOR USER-SESSION. :^) ; ;###################################################################
-rw-r--r--xorg.service.in14
-rw-r--r--xorg.target.in12
2 files changed, 26 insertions, 0 deletions
diff --git a/xorg.service.in b/xorg.service.in
new file mode 100644
index 0000000..3efac12
--- /dev/null
+++ b/xorg.service.in
@@ -0,0 +1,14 @@
+
+#
+# Minimal Xorg service file - launches Xorg as a service unit
+#
+
+[Unit]
+Description=Xorg server launch helper
+Wants=syslog.target dbus.service
+
+[Service]
+ExecStart=@prefix@/bin/xorg-launch-helper
+Restart=always
+RestartSec=10
+
diff --git a/xorg.target.in b/xorg.target.in
new file mode 100644
index 0000000..79299e5
--- /dev/null
+++ b/xorg.target.in
@@ -0,0 +1,12 @@
+
+#
+# X server target
+#
+
+# xorg.target is a virtual target - it becomes active as soon as Xorg
+# is ready to accept incoming connections. If your service requires
+# Xorg to be ready, include 'After=xorg.target' in your service file.
+
+[Unit]
+Description=The basic Xorg server
+