[X2Go-Commits] [x2goserver] 28/50: xsettings: create XSETTINGSD_OVERRIDES_CONF if missing.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.

commit ae7792b1b302b96b4eda88edb6afd58fc26b31f3
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 01:53:11 2014 +0100

    xsettings: create XSETTINGSD_OVERRIDES_CONF if missing.
---
 .../post-start.d/900_xsettings-xsettingsd-startup  |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
index 0baeadb..eb8885a 100644
--- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
+++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
@@ -132,6 +132,14 @@ export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9
 XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}"
 [ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}"
 
+# Create a missing XSETTINGSD_OVERRIDES_CONF, if necessary.
+if [ ! -f "${XSETTINGSD_OVERRIDES_CONF}" ]; then
+  (echo "# xsettings overrides file for X2Go."
+   echo "# Created on $(date "+%Y-%m-%d %T")."
+   echo "# You may edit this file to fit your needs."
+   echo "# All settings in here will override remote machine or global settings.") > "${XSETTINGSD_OVERRIDES_CONF}"
+fi
+
 merge "${XSETTINGSD_BASE_CONF}" "${XSETTINGSD_OVERRIDES_CONF}" "${XSETTINGSD_CONF}" "${X2GO_SESSION_DIR}"
 
 nohup xsettingsd -c "${XSETTINGSD_CONF}" >"${XSETTINGSD_LOG}" 2>&1 & echo "${!}" > "${XSETTINGSD_PID}"

--
Alioth's /srv/git/code.x2go.org/x2goserver.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git