From 1399871f4d004b5f457b2e3a8c213a4dc1141125 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sun, 11 Aug 2013 04:25:40 +0200
Subject: [PATCH] xorg-server: monitor debug.conf, start with debug logging if
 we start in debug mode, service files rework

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/sysutils/systemd/scripts/openelec-debugconfig |  1 +
 packages/x11/xserver/xorg-server/package.mk            |  2 +-
 .../x11/xserver/xorg-server/scripts/xorg-configure     |  9 ++-------
 .../x11/xserver/xorg-server/system.d/xorg-monitor.path |  9 +++++++++
 .../xserver/xorg-server/system.d/xorg-monitor.service  | 10 ++++++++++
 .../x11/xserver/xorg-server/system.d/xorg-server.path  |  2 +-
 .../xserver/xorg-server/system.d/xorg-server.service   |  5 +++--
 .../xserver/xorg-server/tmpfiles.d/xorg-server.conf    |  1 -
 8 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
 create mode 100644 packages/x11/xserver/xorg-server/system.d/xorg-monitor.service

diff --git a/packages/sysutils/systemd/scripts/openelec-debugconfig b/packages/sysutils/systemd/scripts/openelec-debugconfig
index 9f250403a6..90a39c9cc1 100755
--- a/packages/sysutils/systemd/scripts/openelec-debugconfig
+++ b/packages/sysutils/systemd/scripts/openelec-debugconfig
@@ -23,4 +23,5 @@ mkdir -p /run/openelec
 
 cat > /run/openelec/debug.conf <<EOF
 AVAHI_DEBUG="--debug"
+XORG_DEBUG="-logverbose 6 -verbose 6"
 EOF
\ No newline at end of file
diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk
index 44b1718526..e819bfad99 100644
--- a/packages/x11/xserver/xorg-server/package.mk
+++ b/packages/x11/xserver/xorg-server/package.mk
@@ -193,6 +193,6 @@ post_makeinstall_target() {
 }
 
 post_install() {
-#  enable_service xorg-server.service
+  enable_service xorg-monitor.path
   enable_service xorg-server.path
 }
diff --git a/packages/x11/xserver/xorg-server/scripts/xorg-configure b/packages/x11/xserver/xorg-server/scripts/xorg-configure
index 9c38fbed62..1e631c79d8 100755
--- a/packages/x11/xserver/xorg-server/scripts/xorg-configure
+++ b/packages/x11/xserver/xorg-server/scripts/xorg-configure
@@ -50,12 +50,6 @@ logger -t Xorg "### creating start options ###"
 
   XORG_ARGS="-s 0 -noreset -allowMouseOpenFail"
 
-  if [ "$DEBUG" = yes -o -f $HOME/.config/debug.xorg ]; then
-    XORG_ARGS="$XORG_ARGS -logverbose 6 -verbose 6"
-  else
-    XORG_ARGS="$XORG_ARGS -logverbose 0 -verbose 0"
-  fi
-
   # load user defined xorg.conf, if exist
   if [ -f "$XORG_CONF_USER" ]; then
     XORG_ARGS="$XORG_ARGS -config $XORG_CONF_USER"
@@ -95,4 +89,5 @@ logger -t Xorg "### creating needed directories and symlinks ###"
 ################################################################################
 
 logger -t Xorg "### starting Xorg with '$DISPLAY vt01 $XORG_ARGS' ###"
-  echo "X11_ARGS=\"$XORG_ARGS\"" >> /run/X11/xorg-settings.conf
+  mkdir -p /run/openelec
+  echo "XORG_ARGS=\"$XORG_ARGS\"" > /run/openelec/xorg-settings.conf
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
new file mode 100644
index 0000000000..bc7a118955
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.path
@@ -0,0 +1,9 @@
+[Unit]
+Description=Xorg configfile monitor
+After=xorg-server.service
+
+[Path]
+PathModified=/run/openelec/debug.conf
+
+[Install]
+WantedBy=graphical.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
new file mode 100644
index 0000000000..e1d8f18df6
--- /dev/null
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-monitor.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Xorg configfile monitor
+After=xorg-server.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/systemctl restart xorg-server.service
+
+[Install]
+WantedBy=graphical.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-server.path b/packages/x11/xserver/xorg-server/system.d/xorg-server.path
index 959f026fff..38f64ab059 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-server.path
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-server.path
@@ -2,7 +2,7 @@
 Description=Xorg server configfile watcher
 
 [Path]
-PathExists=/run/X11/xorg-settings.conf
+PathExists=/run/openelec/xorg-settings.conf
 
 [Install]
 WantedBy=graphical.target
diff --git a/packages/x11/xserver/xorg-server/system.d/xorg-server.service b/packages/x11/xserver/xorg-server/system.d/xorg-server.service
index 41ece99a85..b14488180f 100644
--- a/packages/x11/xserver/xorg-server/system.d/xorg-server.service
+++ b/packages/x11/xserver/xorg-server/system.d/xorg-server.service
@@ -6,8 +6,9 @@ After=multi-user.target
 
 [Service]
 Environment=DISPLAY=:0.0
-EnvironmentFile=/run/X11/xorg-settings.conf
-ExecStart=/usr/bin/Xorg vt01 $X11_ARGS
+EnvironmentFile=/run/openelec/xorg-settings.conf
+EnvironmentFile=-/run/openelec/debug.conf
+ExecStart=/usr/bin/Xorg vt01 $XORG_ARGS $XORG_DEBUG
 Restart=always
 
 [Install]
diff --git a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf
index 36bc2fce17..ba39386809 100644
--- a/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf
+++ b/packages/x11/xserver/xorg-server/tmpfiles.d/xorg-server.conf
@@ -20,4 +20,3 @@
 
 d    /var/cache/xkb  0755 root root - -
 d    /var/lib        0755 root root - -
-d    /run/X11        0755 root root - -