[X2Go-Commits] [x2goserver] 24/50: xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 16 06:29:24 CET 2015


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 3b64611141fb6c7ebce2e7aa4f75a475d71e89a5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Nov 24 01:23:40 2014 +0100

    xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR.
---
 .../post-start.d/900_xsettings-xsettingsd-startup  |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 a802e26..ff93fb7 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
@@ -122,6 +122,7 @@ XSETTINGSD_CONF="${X2GO_CONF_DIR}/xsettings.conf"
 
 export DISPLAY=":$(echo "${X2GO_SESSIONINFO}" | cut -d "|" -f3 | sed -e "s/[^0-9\-]//g")"
 
-[ -r "${XSETTINGSD_USER_CONF}" ] && XSETTINGSD_CONF="${XSETTINGSD_USER_CONF}" || XSETTINGSD_CONF="${XSETTINGSD_DEFAULT_CONF}"
+XSETTINGSD_BASE_CONF="${XSETTINGSD_DEFAULT_CONF}"
+[ -r "${XSETTINGSD_REMOTE_CONF}" ] && XSETTINGSD_BASE_CONF="${XSETTINGSD_REMOTE_CONF}"
 
 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


More information about the x2go-commits mailing list