[X2Go-Commits] [x2goserver] 05/05: xsettings: use merge shell function to merge the determined base config with the overrides config.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 24 01:26:09 CET 2014


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

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

commit d7f158f96ca021ca43f8fd58168488aaba858661
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 01:25:49 2014 +0100

    xsettings: use merge shell function to merge the determined base config with the overrides config.
---
 .../post-start.d/900_xsettings-xsettingsd-startup  |    2 ++
 1 file changed, 2 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 ff93fb7..9468359 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
@@ -125,4 +125,6 @@ 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}"
 
+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/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list