This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 80e838f6a7fa616f270e69b70d9aaddec964ee07 Author: Orion Poplawski <orion@nwra.com> Date: Fri Aug 17 11:04:03 2018 -0600 Allow setting nxagent nx/nx options on the server via x2goagent.options --- debian/changelog | 5 +++++ x2goserver-x2goagent/etc/x2goagent.options | 3 +++ x2goserver/bin/x2gostartagent | 11 +++++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 88ad5c4..9c2ce9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -86,6 +86,11 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Replace historical "egrep" with "grep -E". + More curly braces, quotes etc. + [ Orion Poplawski ] + * New upstream version (4.1.0.3): + - Allow setting nxagent nx/nx options on the server via x2goagent.options. + (Fixes: #1322). + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 x2goserver (4.1.0.2-0x2go1) unstable; urgency=medium diff --git a/x2goserver-x2goagent/etc/x2goagent.options b/x2goserver-x2goagent/etc/x2goagent.options index a521d17..b7828b1 100644 --- a/x2goserver-x2goagent/etc/x2goagent.options +++ b/x2goserver-x2goagent/etc/x2goagent.options @@ -33,3 +33,6 @@ X2GO_NXAGENT_DEFAULT_OPTIONS+=" -nolisten tcp" # Disable BIG-REQUESTS, nx-libs does not implement this extension correctly. # Leads to all sorts of weird crashes if left enabled. X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension BIG-REQUESTS" + +# Extra nxagent nx/nx options, separated by commas. For example: sleep=0 +X2GO_NXOPTIONS="" diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent index 88d015c..af1e2c4 100755 --- a/x2goserver/bin/x2gostartagent +++ b/x2goserver/bin/x2gostartagent @@ -402,14 +402,17 @@ fi typeset xinerama_option='1' [[ "${x2go_xinerama}" = '0' ]] && xinerama_option='0' +typeset kbtype_option="${X2GO_KBD_TYPE}" if [[ "${X2GO_SET_KBD}" = '0' ]] || [[ "${X2GO_KBD_TYPE}" = 'auto' ]]; then - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG},kbtype=null/null,${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,state=${STATE_FILE}" -else - X2GO_HOST="nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG},kbtype=${X2GO_KBD_TYPE},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,state=${STATE_FILE}" + kbtype_option="null/null" fi +# Ensure X2GO_NXOPTIONS ends with a , if needed +if [[ -n "${X2GO_NXOPTIONS}" ]]; then + X2GO_NXOPTIONS="${X2GO_NXOPTIONS%,}," +fi -echo "${X2GO_HOST}:${X2GO_PORT}" >"${SESSION_DIR}/options" +echo "nx/nx,link=${X2GO_LINK},pack=${X2GO_PACK},limit=0,root=${SESSION_DIR},cache=8M,images=32M,type=${X2GO_TYPE},id=${SESSION_NAME},cookie=${X2GO_COOKIE},errors=${SESSION_LOG},kbtype=${kbtype_option},${option_geometry}xinerama=${xinerama_option},resize=${X2GO_RESIZE},fullscreen=${X2GO_FULLSCREEN},accept=${REMOTE},listen=${GR_PORT}${clipboard},client=linux,menu=0,${X2GO_NXOPTIONS}state=${STATE_FILE}:${X2GO_PORT}" >"${SESSION_DIR}/options" NX_AGENT=":${X2GO_PORT}" SAVED_DISPLAY="${DISPLAY}" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git