This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop-stretch in repository live-build-x2go. commit 03fda33bafd7842d6532670173ea1f2b149fb659 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 6 01:14:18 2019 +0000 x2goclient start script is not needed in minidesktop modex2goclient start script is not needed in minidesktop mode --- .../etc/X11/Xsession.d/61x11-start-x2goclient | 103 --------------------- 1 file changed, 103 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient b/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient deleted file mode 100644 index e22b47e..0000000 --- a/config/includes.chroot/etc/X11/Xsession.d/61x11-start-x2goclient +++ /dev/null @@ -1,103 +0,0 @@ -# Get X2GoConfig -BROKERURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F'=' ' /^broker-url=/ { print $2 }' | tr -dc 'a-zA-Z0-9.:/?%_\-@') -SESSIONSELECT=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F'=' ' /^session=/ { print $2 }' | tr -dc 'a-zA-Z0-9.:/ _\-@') -LDAP=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | sed 's/^ldap=/ldap#/' | awk -F'#' ' /^ldap#/ { print $2 }' | tr -dc 'a-zA-Z0-9.:_\-@') -LDAP1=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | sed 's/^ldap1=/ldap1#/' | awk -F'#' ' /^ldap1#/ { print $2 }' | tr -dc 'a-zA-Z0-9.:_\-@') -LDAP2=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | sed 's/^ldap2=/ldap2#/' | awk -F'#' ' /^ldap2#/ { print $2 }' | tr -dc 'a-zA-Z0-9.:_\-@') - - -# Check for background and branding SVGs -BRANDING='' -OLDCON='' -if grep -q ' branding=' /proc/cmdline; then - while ! [ -s "/etc/x2go/branding.svg" ]; do - [ -z "$OLDCON" ] && OLDCON="$(fgconsole)" - chvt "1" - echo "'$0' is waiting for a valid '/etc/x2go/branding.svg' file." - sleep "2" - done - [ -n "$OLDCON" ] && chvt "$OLDCON" - BRANDING='--branding=/etc/x2go/branding.svg' -fi -BACKGROUND='' -OLDCON='' -if grep -q ' bg=' /proc/cmdline; then - while ! [ -s "/etc/x2go/bg.svg" ]; do - [ -z "$OLDCON" ] && OLDCON="$(fgconsole)" - chvt "1" - echo "'$0' is waiting for a valid '/etc/x2go/bg.svg' file." - sleep "2" - done - [ -n "$OLDCON" ] && chvt "$OLDCON" - BACKGROUND='--background=/etc/x2go/bg.svg' -fi - -# Spawn X2GoClient -if [ -n "$SESSIONSELECT" ]; then - STARTSESSION="--session='$SESSIONSELECT'" -fi -if [ -n "$BROKERURL" ]; then - SESSIONFROM="--broker-url=$BROKERURL" -else - SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions" - OLDCON='' - while ! [ -s "/etc/x2go/x2gothinclient_sessions" ]; do - [ -z "$OLDCON" ] && OLDCON="$(fgconsole)" - chvt "1" - echo "'$0' is waiting for a valid '/etc/x2go/x2gothinclient_sessions' file." - sleep "2" - done - [ -n "$OLDCON" ] && chvt "$OLDCON" -fi -if [ -n "$LDAP" ] ; then - if [ -n "$LDAP1" ] ; then - BACKUPLDAP="--ldap1=$LDAP1" - if [ -n "$LDAP2" ] ; then - BACKUPLDAP="$BACKUPLDAP --ldap2=$LDAP2" - fi - fi - LDAPPARAMS="--ldap=$LDAP $BACKUPLDAP" -else - LDAPPARAMS="" -fi - - -THROTTLINGCOMMAND="" -THROTTLEVALUES=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "throttle" { print $2 }' | tr -dc '0-9.:u') -if [ -n "$THROTTLEVALUES" ]; then - # determine maximum line speed - # look for all interfaces in state "up", then read their speed value from the file named speed - # just ignore the output if there is none, then sort numeric, unique, and read last line=highest, - # then sanitize - MAXSPEEDMBIT=$(grep -l "up" /sys/class/net/*/operstate | xargs -n1 dirname | xargs -n 1 -I XXX cat XXX/speed 2>/dev/null | sort -n -u | tail -1 | tr -dc '0-9.') - MAXSPEEDKBYTE=$((MAXSPEEDMBIT*128)) #Megabit * 1024 / 8 -> KiloByte - - THROTTLEARR=($(echo $THROTTLEVALUES | awk -F ':' '$1 ~/^[0-9\.u]*$/ && $2 ~/^[0-9\.u]*$/ && $3 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ && $4 ~/^[0-9\.u]*$/ { print $1 " " $2 " " $3 " " $4 " " $5}')) - if [ -n "${THROTTLEARR[0]}" ] && [ "${THROTTLEARR[0]}" != "u" ]; then - THROTTLEDOWN="-d ${THROTTLEARR[0]}" # default 10, never used - elif [ "${THROTTLEARR[0]}" = "u" ]; then - THROTTLEDOWN="-d $MAXSPEEDKBYTE" - fi - if [ -n "${THROTTLEARR[1]}" ] && [ "${THROTTLEARR[1]}" != "u" ]; then - THROTTLEUP="-u ${THROTTLEARR[1]}" # default 10, never used - elif [ "${THROTTLEARR[1]}" = "u" ]; then - THROTTLEUP="-d $MAXSPEEDKBYTE" - elif [ -z "${THROTTLEARR[1]}" ] ; then - THROTTLEUP="-d ${THROTTLEARR[0]}" # set up=down if only 1 param - fi - if [ -n "${THROTTLEARR[2]}" ] ; then - THROTTLETIME="-t ${THROTTLEARR[2]}" # default 3.0 - fi - if [ -n "${THROTTLEARR[3]}" ] ; then - THROTTLELENGTH="-l ${THROTTLEARR[3]}" # default 20 - fi - if [ -n "${THROTTLEARR[4]}" ] ; then - THROTTLELATENCY="-L ${THROTTLEARR[4]}" # default 0 - fi - # only set THROTTLINGCOMMAND if at least one value was detected and sanitized properly - if [ -n "$THROTTLEUP" ] || [ -n "$THROTTLEDOWN" ] || [ -n "$THROTTLETIME" ] || [ -n "$THROTTLELENGTH" ] || [ -n "$THROTTLELATENCY" ]; then - THROTTLINGCOMMAND="trickle -s $THROTTLEDOWN $THROTTLEUP $THROTTLETIME $THROTTLELENGTH $THROTTLELATENCY" - fi -fi - -eval $THROTTLINGCOMMAND x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export $LDAPPARAMS $SESSIONFROM $BACKGROUND $BRANDING $STARTSESSION -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git