This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/fvwm in repository live-build-x2go. from 7218c7d conflict with libxcompext3 new 59130bb name change new dc4eabc name change new c41a1fd adds support for "nouser" - runs passwd -l on account "user", so password "live" becomes invalid new 21a918f fixed whitespace detection around cmdline parameters new f7c6c16 name change new 5f1140e name change new aeaebd9 name change new 1923c4b name change new 9f7c98a x2go-getsessions new f20c468 Position of SESSIONSDESTINATION variable was wrong, which caused it to be empty later on new 8f900a7 whitespace fix new af1215e fixed indenting in config/includes.chroot/lib/live/config/2600-x2go-getsessions Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, new 5961474 typofix, and different invocation of pulseaudio new b8d2e53 moved audio volume presets to xsession - seems to require running PA new e1d5272 moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now new e9512f1 Removed amixer calls, did not work anyways new 7559adb Startup display message changed new 05e845f added support for passing of LDAP parameters new c4161a2 added multiscreen/xinerama support new 3cc2198 fixed various syntax errors stemming from perl->bash conversion new d59299f fixed further perlisms new 7274f5e openbox configuration refined and documented new 315791b added option to disable screen blanking new 07878a4 fixed whitespace detection around cmdline parameters new e7a05fd changed noblank to blank=minutes (0 turns feature off, along with dpms) new e6ad556 changed blank/nodpms parameters new 6221baf typofix, forgot escapes new 7173d4c fix dpms call new 74d354c added parameter and directory creation for filesharing support new feb1fbe File Sharing wasn't working - ownership/permissions issue fixed now new 6043b33 permissions were wrong again (777), must be 700 new ea907f0 make sure Alt-F4 is non-functional new 184f9f7 off-by-one-error new a36c17c OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. new 7c18e94 2800-x2go-thinclientconfig: added quotation marks The 35 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../lib/live/config/2000-showifconfig | 39 +++ .../includes.chroot/lib/live/config/2100-lockuser | 20 ++ .../lib/live/config/2150-getsshpubkeysfromserver | 54 ++++ .../lib/live/config/2200-xserver-xorg-getxorgconf | 45 ++++ .../lib/live/config/2600-x2go-getsessions | 46 ++++ .../lib/live/config/2800-x2go-thinclientconfig | 295 +++++++++++++++++++++ 6 files changed, 499 insertions(+) create mode 100755 config/includes.chroot/lib/live/config/2000-showifconfig create mode 100755 config/includes.chroot/lib/live/config/2100-lockuser create mode 100755 config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver create mode 100755 config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf create mode 100755 config/includes.chroot/lib/live/config/2600-x2go-getsessions create mode 100755 config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit c41a1fdbde97f0e42662e8948b9aff66c229294c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jul 12 18:09:54 2016 +0200 adds support for "nouser" - runs passwd -l on account "user", so password "live" becomes invalid --- config/includes.chroot/lib/live/config/2100-lockuser | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2100-lockuser b/config/includes.chroot/lib/live/config/2100-lockuser new file mode 100755 index 0000000..7f89531 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2100-lockuser @@ -0,0 +1,20 @@ +#!/bin/sh + +LockUser () +{ + +# Output startup message +# +echo -n " lockuser" + + +# Set password +# +if grep -q " *nouser *" /proc/cmdline ; then + passwd -l user >/dev/null +fi + +} + +LockUser + -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 59130bb6cda6cd9304769b0720935e877be66b30 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:04:24 2017 +0100 name change --- .../lib/live/config/2000-showifconfig | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig new file mode 100755 index 0000000..fb108ea --- /dev/null +++ b/config/includes.chroot/lib/live/config/2000-showifconfig @@ -0,0 +1,39 @@ +#!/bin/bash + +IFConfig () +{ + +# Output startup message +# +echo -n " ifconfig" + +#setterm -term linux -r >/dev/tty9 +# Make sure no language-specific stuff interferes with our matching +# grep: highlight everything that matches "inet" to the end of its line +# and also (-E, |$) show every line that has an end => Everything else +# Output the result on virtual terminal 9 +cat >/etc/network/if-up.d/showips <<SHOWIPS +#!/bin/bash +export TERM=linux; + +while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do + sleep 2 +done + +IPMSG=\$(LANG=C \ +/sbin/ip a | \ +/bin/grep -P --color=always "inet.*? [\. 0-9a-f:/]*? |$" | \ +GREP_COLOR="1;32" \ +/bin/grep -P --color=always "link/ether .*? |$" ); \ +IPMSG=\$( sed 's/^/- /' <<< "\$IPMSG" ); +sed -i '/^- /d' /etc/issue; +sed -i '/^- /d' /etc/issue.net; +echo "\$IPMSG" >> /etc/issue; +echo "\$IPMSG" >> /etc/issue.net +SHOWIPS + +chmod 755 /etc/network/if-up.d/showips + +} + +IFConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit dc4eabc10bf8f30e210a4e8b0bfe819dc0c4c9e1 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:05:21 2017 +0100 name change --- config/includes.chroot/lib/live/config/2000-showifconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig index fb108ea..20896d4 100755 --- a/config/includes.chroot/lib/live/config/2000-showifconfig +++ b/config/includes.chroot/lib/live/config/2000-showifconfig @@ -1,11 +1,11 @@ #!/bin/bash -IFConfig () +ShowIFConfig () { # Output startup message # -echo -n " ifconfig" +echo -n " showifconfig" #setterm -term linux -r >/dev/tty9 # Make sure no language-specific stuff interferes with our matching @@ -36,4 +36,4 @@ chmod 755 /etc/network/if-up.d/showips } -IFConfig +ShowIFConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 21a918fe4a59212e6dcc7c7b7e191a19911883ed Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 20:21:23 2016 +0100 fixed whitespace detection around cmdline parameters --- .../includes.chroot/lib/live/config/2100-lockuser | 2 +- .../lib/live/config/2800-x2go-thinclientconfig | 136 +++++++++++++++++++++ 2 files changed, 137 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2100-lockuser b/config/includes.chroot/lib/live/config/2100-lockuser index 7f89531..1cbcc15 100755 --- a/config/includes.chroot/lib/live/config/2100-lockuser +++ b/config/includes.chroot/lib/live/config/2100-lockuser @@ -10,7 +10,7 @@ echo -n " lockuser" # Set password # -if grep -q " *nouser *" /proc/cmdline ; then +if grep -q "\W*nouser\W*" /proc/cmdline ; then passwd -l user >/dev/null fi diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig new file mode 100755 index 0000000..76e254f --- /dev/null +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -0,0 +1,136 @@ +#!/bin/bash + +X2GoThinClientConfig () +{ + +# Output startup message +# +echo -n " x2go-thinclientconfig" + +# using xmlstarlet would mean wasting yet another Megabyte of space ... +# disable virtual desktops +sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml +# disable OpenBox context menu (would be accessible in xinerama) +sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml +# make sure OpenBox maximizes X2GoClient on launch and hides window decorations +sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml + +cat >/home/user/.xsession <<XSESSION +# inspired by +# http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanag... +# check the above file for ideas before reinventing the wheel + +# Spawn PulseAudio +pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & + +# additional variable instead of "case \$(...) in", as we need the value again later on +XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "xinerama" { print \$2 }') + +# sanitize input +case \$XRANDRCMDTAINTED in +"above") + XRANDRCMD="above" + ;; +"below") + XRANDRCMD="below" + ;; +"same-as") + XRANDRCMD="same-as" + ;; +"right-of") + XRANDRCMD="right-of" + ;; +*) + XRANDRCMD="left-of" # default + ;; +esac + +# find out how many touch devices we have +TOUCHDEVICESCOUNT=\$(LANG=C xsetwacom --list devices | wc -l) + +# find out how many mouse devices we have +MICECOUNT=\$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l) + +# loop through the following code block for all connected display devices +for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1); do + + #remove trailing newline from NEXT_DISPLAY + NEXT_DISPLAY=\${NEXT_DISPLAY%\$'\n'} + + # THIS_DISPLAY won't be defined until the second time the loop is executed, which is a + # neat way of running xrandr only if there are at least two connected display devices + if [ -n \${THIS_DISPLAY+x} ] ; then + + if [ \$TOUCHDEVICESCOUNT -gt 0 ] && [ \$MICECOUNT -lt 1 ] && [ -z \$XRANDRCMDTAINTED ]; then + # we have a touch device and no mice, and no xinerama parameter was set, + # so switch to clone view to make the touch device usable + /usr/bin/xrandr --output \$NEXT_DISPLAY --same-as \$THIS_DISPLAY + + else + # else use whatever is in XRANDRCMD (which is either our default of "left-of", + # or a valid xinerama kernel parameter value) + /usr/bin/xrandr --output \$NEXT_DISPLAY --\$XRANDRCMD \$THIS_DISPLAY + fi + + # now set THIS_DISPLAY -> every subsequent iteration of the loop will now enter the code block + # above where [ -n \${THIS_DISPLAY+x} ] is the conditional + THIS_DISPLAY=\$NEXT_DISPLAY + fi +done + +# Spawn openbox +openbox & + +# set screen background to X2Go default blue on all detected screens +xsetroot -solid "#246ed8" + +# Get X2GoConfig +BROKERURL=\$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^broker-url=/ { print \$2 }') +LDAP=\$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + sed 's/^ldap=/ldap#/' | \ + awk -F'#' ' /^ldap#/ { print \$2 }') +LDAP1=\$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + sed 's/^ldap1=/ldap1#/' | \ + awk -F'#' ' /^ldap1#/ { print \$2 }') +LDAP2=\$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + sed 's/^ldap2=/ldap2#/' | \ + awk -F'#' ' /^ldap2#/ { print \$2 }') + +# Spawn X2GoClient +if [ -n "\$BROKERURL" ]; then + SESSIONFROM="--broker-url=\$BROKERURL" +else + SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions" +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 + +if grep -q '\W*noblank\W*' /proc/cmdline; then + # Disable screensaver and DPMS Power Saving if requested + xset s off + xset -dpms +fi + +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM +XSESSION + +chown user:user /home/user/.xsession +chmod 644 /home/user/.xsession + +} + +X2GoThinClientConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit aeaebd92f50797f2c5c72bdd8413739a679f2637 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:05:59 2017 +0100 name change --- .../lib/live/config/2200-xserver-xorg-getxorgconf | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf new file mode 100755 index 0000000..d28bf04 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf @@ -0,0 +1,45 @@ +#!/bin/sh + +X11GetXorgConf () +{ +# Output startup message +# +echo -n " x11-getxorgconf" + + XORGCONFURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^xorgconfurl=/ { print $2 }') + if [ -n "$XORGCONFURL" ] && [ -d /etc/X11 ] ; then + XORGCONFDESTINATION=/etc/X11/xorg.conf.new + cat >/etc/network/if-up.d/getxorgconf <<GETXORG +#!/bin/bash +export TERM=linux; + +while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do + sleep 2 +done +if echo "$XORGCONFURL" | grep -q "^tftp://" ; then + XORGCONFSERVER=$(echo "$XORGCONFURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' ) + XORGCONFPATH=$(echo "$XORGCONFURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' ) + if [ -n "$XORGCONFSERVER" ] && [ -n "$XORGCONFPATH" ] ; then + while ! atftp $XORGCONFSERVER -g -r $XORGCONFPATH -l $XORGCONFDESTINATION ; do + echo "Waiting for xorg.conf download ..." + sleep 5 + done + fi +else + while ! wget -q -O $XORGCONFDESTINATION $XORGCONFURL ; do + echo "Waiting for xorg.conf download ..." + sleep 5 + done +fi + +if [ -s $XORGCONFDESTINATION ] ; then + mv $XORGCONFDESTINATION /etc/X11/xorg.conf +fi + +GETXORG + chmod 755 /etc/network/if-up.d/getxorgconf + fi +} +X11GetXorgConf -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit f7c6c16108a9fb8e5cb8550dcc95c3fce49401d9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:10:31 2017 +0100 name change --- .../lib/live/config/2150-getsshpubkeysfromserver | 54 ++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver new file mode 100755 index 0000000..a40918d --- /dev/null +++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver @@ -0,0 +1,54 @@ +#!/bin/sh + +SetSSHKey () +{ + + # Output startup message + # + echo -n " setsshkey" + + + PUBKEYURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^pubkey=/ { print $2 }') + + if [ -n "$PUBKEYURL" ] ; then + cat >/etc/network/if-up.d/getpubkey <<GETPUBKEY +#!/bin/bash +export TERM=linux; + +while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do + sleep 2 +done + +# Set Keyfile +# +mkdir -p /root/.ssh +chmod 600 /root/.ssh +touch /root/.ssh/authorized_keys +chmod 600 /root/.ssh/authorized_keys + +if echo "$PUBKEY" | grep -q "^tftp://" ; then + PUBKEYSERVER=$(echo "$PUBKEYURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' ) + PUBKEYPATH=$(echo "$PUBKEYURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' ) + if [ -n "$PUBKEYSERVER" ] && [ -n "$PUBKEYPATH" ] ; then + while ! atftp $PUBKEYSERVER -g -r $PUBKEYPATH -l /root/.ssh/authorized_keys ; do + echo "Waiting for SSH Public Key ..." + sleep 5 + done + fi +else + while ! wget -q -O - $PUBKEYURL >/root/.ssh/authorized_keys ; do + echo "Waiting for SSH Public Key ..." + sleep 5 + done +fi +GETPUBKEY + + chmod 755 /etc/network/if-up.d/getpubkey + fi + +} + +SetSSHKey + -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 9f7c98aded275c804f9fd473a950f1edfec706e4 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Mon Jun 20 16:51:30 2016 +0200 x2go-getsessions --- .../lib/live/config/2600-x2go-getsessions | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions new file mode 100755 index 0000000..7b15e7d --- /dev/null +++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions @@ -0,0 +1,47 @@ +#!/bin/sh + +X2GoGetSessions () +{ +# Output startup message +# +echo -n " x2go-getsessions" + + + SESSIONSURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^sessionsurl=/ { print $2 }') + if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then + cat >/etc/network/if-up.d/getsessions <<GETSESS +#!/bin/bash +export TERM=linux; +SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new + +while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do + sleep 2 +done +if echo "$SESSIONSURL" | grep -q "^tftp://" ; then + SESSIONSSERVER=$(echo "$SESSIONSURL" | sed 's#^tftp://\([^/]*\)/.*$#\1#' ) + SESSIONSPATH=$(echo "$SESSIONSURL" | sed 's#^tftp://[^/]*/\(.*\)$#\1#' ) + if [ -n "$SESSIONSSERVER" ] && [ -n "$SESSIONSPATH" ] ; then + while ! atftp $SESSIONSSERVER -g -r $SESSIONSPATH -l $SESSIONSDESTINATION ; do + echo "Waiting for session config data ..." + sleep 5 + done + fi +else + while ! wget -q -O $SESSIONSDESTINATION $SESSIONSURL ; do + echo "Waiting for session config data ..." + sleep 5 + done +fi + +if [ -s $SESSIONSDESTINATION ] ; then + mv $SESSIONSDESTINATION /etc/x2go/x2gothinclient_sessions +fi + +GETSESS + chmod 755 /etc/network/if-up.d/getsessions + fi +} + +X2GoGetSessions -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit f20c468261c82f09af0d00c1272fa387d72c8733 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 14:57:26 2016 +0200 Position of SESSIONSDESTINATION variable was wrong, which caused it to be empty later on --- config/includes.chroot/lib/live/config/2600-x2go-getsessions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions index 7b15e7d..b43851a 100755 --- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions +++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions @@ -11,10 +11,10 @@ echo -n " x2go-getsessions" tr ' ' '\n' | \ awk -F'=' ' /^sessionsurl=/ { print $2 }') if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then + SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new cat >/etc/network/if-up.d/getsessions <<GETSESS #!/bin/bash export TERM=linux; -SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do sleep 2 -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 1923c4bd5b5ae0d3ffc83e98ec5213dc65eba928 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:07:22 2017 +0100 name change --- .../includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf index d28bf04..2dd20da 100755 --- a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf +++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf @@ -1,10 +1,10 @@ #!/bin/sh -X11GetXorgConf () +XServerXorgGetXorgConf () { # Output startup message # -echo -n " x11-getxorgconf" +echo -n " xserver-xorg-getxorgconf" XORGCONFURL=$(cat /proc/cmdline | \ tr ' ' '\n' | \ @@ -42,4 +42,4 @@ GETXORG chmod 755 /etc/network/if-up.d/getxorgconf fi } -X11GetXorgConf +XServerXorgGetXorgConf -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 5f1140e2f13eebc18bd44adb86d441a658b9a6f5 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:10:42 2017 +0100 name change --- .../lib/live/config/2150-getsshpubkeysfromserver | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver index a40918d..e613d35 100755 --- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver +++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver @@ -1,11 +1,11 @@ #!/bin/sh -SetSSHKey () +GetSSHPubKeysFromServer () { # Output startup message # - echo -n " setsshkey" + echo -n " getsshpubkeysfromserver" PUBKEYURL=$(cat /proc/cmdline | \ @@ -13,7 +13,7 @@ SetSSHKey () awk -F'=' ' /^pubkey=/ { print $2 }') if [ -n "$PUBKEYURL" ] ; then - cat >/etc/network/if-up.d/getpubkey <<GETPUBKEY + cat >/etc/network/if-up.d/getsshpubkeysfromserver <<GETPUBKEY #!/bin/bash export TERM=linux; @@ -45,10 +45,10 @@ else fi GETPUBKEY - chmod 755 /etc/network/if-up.d/getpubkey + chmod 755 /etc/network/if-up.d/getsshpubkeysfromserver fi } -SetSSHKey +GetSSHPubKeysFromServer -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 8f900a73abaadf423de498904da09e3e470e2650 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 19:00:11 2016 +0200 whitespace fix --- config/includes.chroot/lib/live/config/2600-x2go-getsessions | 1 - 1 file changed, 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions index b43851a..20006b9 100755 --- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions +++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions @@ -6,7 +6,6 @@ X2GoGetSessions () # echo -n " x2go-getsessions" - SESSIONSURL=$(cat /proc/cmdline | \ tr ' ' '\n' | \ awk -F'=' ' /^sessionsurl=/ { print $2 }') -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit af1215e0e72ed42ec1dc0175139e64d83d766b17 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 17 01:29:29 2016 +0100 fixed indenting in config/includes.chroot/lib/live/config/2600-x2go-getsessions Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen, --- .../lib/live/config/2600-x2go-getsessions | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2600-x2go-getsessions b/config/includes.chroot/lib/live/config/2600-x2go-getsessions index 20006b9..74524fc 100755 --- a/config/includes.chroot/lib/live/config/2600-x2go-getsessions +++ b/config/includes.chroot/lib/live/config/2600-x2go-getsessions @@ -2,16 +2,16 @@ X2GoGetSessions () { -# Output startup message -# -echo -n " x2go-getsessions" + # Output startup message + # + echo -n " x2go-getsessions" - SESSIONSURL=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^sessionsurl=/ { print $2 }') - if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then - SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new - cat >/etc/network/if-up.d/getsessions <<GETSESS + SESSIONSURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^sessionsurl=/ { print $2 }') + if [ -n "$SESSIONSURL" ] && [ -d /etc/x2go ] ; then + SESSIONSDESTINATION=/etc/x2go/x2gothinclient_sessions_new + cat >/etc/network/if-up.d/getsessions <<GETSESS #!/bin/bash export TERM=linux; @@ -39,8 +39,8 @@ if [ -s $SESSIONSDESTINATION ] ; then fi GETSESS - chmod 755 /etc/network/if-up.d/getsessions - fi + chmod 755 /etc/network/if-up.d/getsessions + fi } X2GoGetSessions -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 5961474079e11118b9578f1f668188d6a00dcae3 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 21:41:57 2016 +0200 typofix, and different invocation of pulseaudio --- .../lib/live/config/2800-x2go-thinclientconfig | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 76e254f..2dc79c4 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -5,6 +5,7 @@ X2GoThinClientConfig () # Output startup message # +<<<<<<< HEAD echo -n " x2go-thinclientconfig" # using xmlstarlet would mean wasting yet another Megabyte of space ... @@ -13,6 +14,10 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml # disable OpenBox context menu (would be accessible in xinerama) sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations +======= +echo -n " x2gothinclientconfig" + +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml cat >/home/user/.xsession <<XSESSION @@ -21,6 +26,7 @@ cat >/home/user/.xsession <<XSESSION # check the above file for ideas before reinventing the wheel # Spawn PulseAudio +<<<<<<< HEAD pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & # additional variable instead of "case \$(...) in", as we need the value again later on @@ -77,10 +83,14 @@ for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' THIS_DISPLAY=\$NEXT_DISPLAY fi done +======= +ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535")& +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio # Spawn openbox openbox & +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -126,11 +136,22 @@ if grep -q '\W*noblank\W*' /proc/cmdline; then fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM +======= +# Spawn X2GoClient +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio XSESSION chown user:user /home/user/.xsession chmod 644 /home/user/.xsession +<<<<<<< HEAD +======= +# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + +>>>>>>> dd779e0... typofix, and different invocation of pulseaudio } X2GoThinClientConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit b8d2e5384fbfb90cd64496df7d1d531d394a8759 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 22:11:17 2016 +0200 moved audio volume presets to xsession - seems to require running PA --- .../includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 2dc79c4..c709426 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -91,6 +91,7 @@ ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-nati openbox & <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -137,6 +138,12 @@ fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM ======= +======= +# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + +>>>>>>> 2b64e16... moved audio volume presets to xsession - seems to require running PA # Spawn X2GoClient x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions
> dd779e0... typofix, and different invocation of pulseaudio @@ -146,12 +153,15 @@ chown user:user /home/user/.xsession chmod 644 /home/user/.xsession
<<<<<<< HEAD +<<<<<<< HEAD ======= # Set Audio Volume amixer -q sset Master 100 amixer -q sset PCM 100
> dd779e0... typofix, and different invocation of pulseaudio +======= +>>>>>>> 2b64e16... moved audio volume presets to xsession - seems to require running PA }
X2GoThinClientConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit e9512f1a3823f531abdde15c58b8bbae79dd0e6b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jun 22 15:12:51 2016 +0200 Removed amixer calls, did not work anyways --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 85f3546..7129485 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -20,10 +20,6 @@ echo -n " x2gothinclientconfig"
> dd779e0... typofix, and different invocation of pulseaudio sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
-# Set Audio Volume -amixer -q sset Master 100 -amixer -q sset PCM 100 - cat >/home/user/.xsession <<XSESSION # inspired by # http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanag... -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit e1d527266bce6ee7f113b63963178d283d4073fa Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jun 22 10:55:11 2016 +0200 moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now --- .../lib/live/config/2800-x2go-thinclientconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index c709426..85f3546 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -20,6 +20,10 @@ echo -n " x2gothinclientconfig"
> dd779e0... typofix, and different invocation of pulseaudio sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
+# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + cat >/home/user/.xsession <<XSESSION # inspired by # http://code.x2go.org/gitweb?p=x2gothinclient.git;a=blob_plain;f=displaymanag... @@ -27,6 +31,7 @@ cat >/home/user/.xsession <<XSESSION # Spawn PulseAudio <<<<<<< HEAD +<<<<<<< HEAD pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & # additional variable instead of "case \$(...) in", as we need the value again later on @@ -86,12 +91,16 @@ done ======= ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535")&
> dd779e0... typofix, and different invocation of pulseaudio +======= +pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & +>>>>>>> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
# Spawn openbox openbox & <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" @@ -144,6 +153,8 @@ amixer -q sset Master 100 amixer -q sset PCM 100
> 2b64e16... moved audio volume presets to xsession - seems to require running PA +======= +>>>>>>> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now # Spawn X2GoClient x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions > dd779e0... typofix, and different invocation of pulseaudio
-- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 3cc219882a6a0f541b2a010db251fa2a510c273d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Dec 22 01:08:30 2016 +0100 fixed various syntax errors stemming from perl->bash conversion --- .../lib/live/config/2800-x2go-thinclientconfig | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 96557d2..32b9519 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -96,10 +96,10 @@ pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detec
> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
# additional variable instead of "case $(...) in", as we need the value again later on -XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\\\$1 == "xinerama" { print \\\$2 }') +XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '$''1 == "xinerama" { print $''2 }') # sanitize input -case $XRANDRCMDTAINTED in +case \$XRANDRCMDTAINTED in "above") XRANDRCMD="above" ;; @@ -118,10 +118,10 @@ case $XRANDRCMDTAINTED in esac # find out how many touch devices we have -TOUCHDEVICESCOUNT = \$(LANG=C xsetwacom --list devices | wc -l) +TOUCHDEVICESCOUNT=\$(LANG=C xsetwacom --list devices | wc -l) # find out how many mouse devices we have -MICECOUNT = \$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l) +MICECOUNT=\$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l) # loop through the following code block for all connected display devices for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1); do @@ -141,18 +141,15 @@ for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' else # else use whatever is in XRANDRCMD (which is either our default of "left-of", # or a valid xinerama kernel parameter value) - /usr/bin/xrandr --output \$NEXT_DISPLAY --\$xrandrcmd \$THIS_DISPLAY + /usr/bin/xrandr --output \$NEXT_DISPLAY --\$XRANDRCMD \$THIS_DISPLAY fi # now set THIS_DISPLAY -> every subsequent iteration of the loop will now enter the code block # above where [ -n \${THIS_DISPLAY+x} ] is the conditional - THIS_DISPLAY = \$NEXT_DISPLAY + THIS_DISPLAY=\$NEXT_DISPLAY fi done -# set screen background to X2Go default blue on all detected screens -xsetroot -solid "#246ed8" - # Spawn openbox openbox & @@ -160,10 +157,15 @@ openbox & <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" =======
> f495c9f... added support for passing of LDAP parameters +======= +# set screen background to X2Go default blue on all detected screens +xsetroot -solid "#246ed8" +>>>>>>> 8338fe6... fixed various syntax errors stemming from perl->bash conversion
# Get X2GoConfig BROKERURL=\$(cat /proc/cmdline | \ -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit c4161a24e06df3821862880e35f61ef1d9631bd2 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Dec 16 02:31:25 2016 +0100 added multiscreen/xinerama support --- .../lib/live/config/2800-x2go-thinclientconfig | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index f909a7a..96557d2 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -95,6 +95,64 @@ ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-nati pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 &
> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
+# additional variable instead of "case $(...) in", as we need the value again later on +XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\\\$1 == "xinerama" { print \\\$2 }') + +# sanitize input +case $XRANDRCMDTAINTED in +"above") + XRANDRCMD="above" + ;; +"below") + XRANDRCMD="below" + ;; +"same-as") + XRANDRCMD="same-as" + ;; +"right-of") + XRANDRCMD="right-of" + ;; +*) + XRANDRCMD="left-of" # default + ;; +esac + +# find out how many touch devices we have +TOUCHDEVICESCOUNT = \$(LANG=C xsetwacom --list devices | wc -l) + +# find out how many mouse devices we have +MICECOUNT = \$(find /dev/input -maxdepth 1 -name "mouse*" | wc -l) + +# loop through the following code block for all connected display devices +for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' ' -f1); do + + #remove trailing newline from NEXT_DISPLAY + NEXT_DISPLAY=\${NEXT_DISPLAY%\$'\n'} + + # THIS_DISPLAY won't be defined until the second time the loop is executed, which is a + # neat way of running xrandr only if there are at least two connected display devices + if [ -n \${THIS_DISPLAY+x} ] ; then + + if [ \$TOUCHDEVICESCOUNT -gt 0 ] && [ \$MICECOUNT -lt 1 ] && [ -z \$XRANDRCMDTAINTED ]; then + # we have a touch device and no mice, and no xinerama parameter was set, + # so switch to clone view to make the touch device usable + /usr/bin/xrandr --output \$NEXT_DISPLAY --same-as \$THIS_DISPLAY + + else + # else use whatever is in XRANDRCMD (which is either our default of "left-of", + # or a valid xinerama kernel parameter value) + /usr/bin/xrandr --output \$NEXT_DISPLAY --\$xrandrcmd \$THIS_DISPLAY + fi + + # now set THIS_DISPLAY -> every subsequent iteration of the loop will now enter the code block + # above where [ -n \${THIS_DISPLAY+x} ] is the conditional + THIS_DISPLAY = \$NEXT_DISPLAY + fi +done + +# set screen background to X2Go default blue on all detected screens +xsetroot -solid "#246ed8" + # Spawn openbox openbox & -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 7559adb043e7b21170c05f8fb19769002fe1f98a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jul 12 18:09:08 2016 +0200 Startup display message changed --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 7129485..96efbd0 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -6,6 +6,7 @@ X2GoThinClientConfig () # Output startup message # <<<<<<< HEAD +<<<<<<< HEAD echo -n " x2go-thinclientconfig" # using xmlstarlet would mean wasting yet another Megabyte of space ... @@ -16,6 +17,9 @@ sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/ # make sure OpenBox maximizes X2GoClient on launch and hides window decorations ======= echo -n " x2gothinclientconfig" +======= +echo -n " x2go-thinclientconfig" +>>>>>>> fa6f730... Startup display message changed
> dd779e0... typofix, and different invocation of pulseaudio sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
-- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 05e845fc890f0ee1162600ebfb9db85b355c6580 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jul 26 08:59:10 2016 +0200 added support for passing of LDAP parameters --- .../lib/live/config/2800-x2go-thinclientconfig | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 96efbd0..f909a7a 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -101,8 +101,11 @@ openbox & <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD # set screen background to X2Go default blue on all detected screens xsetroot -solid "#246ed8" +======= +>>>>>>> f495c9f... added support for passing of LDAP parameters # Get X2GoConfig BROKERURL=\$(cat /proc/cmdline | \ @@ -121,6 +124,7 @@ LDAP2=\$(cat /proc/cmdline | \ sed 's/^ldap2=/ldap2#/' | \ awk -F'#' ' /^ldap2#/ { print \$2 }') +<<<<<<< HEAD # Spawn X2GoClient if [ -n "\$BROKERURL" ]; then SESSIONFROM="--broker-url=\$BROKERURL" @@ -158,6 +162,27 @@ amixer -q sset PCM 100 # Spawn X2GoClient x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions
> dd779e0... typofix, and different invocation of pulseaudio +======= +# Spawn X2GoClient +if [ -n "\$BROKERURL" ]; then
- SESSIONFROM="--broker-url=\$BROKERURL" +else
- SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions" +fi +if [ -n "\$LDAP" ] ; then
- if [ -n "\$LDAP1" ] ; then
BACKUPLDAP="--ldap1=\$LDAP1"if [ -n "\$LDAP2" ] ; thenfi- fi
- LDAPPARAMS="--ldap=\$LDAP \$BACKUPLDAP" +else
- LDAPPARAMS="" +fi
- +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM +>>>>>>> f495c9f... added support for passing of LDAP parameters XSESSION
chown user:user /home/user/.xsession -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit e7a05fd9d52a74af40b4c104af86f3e164bd2a1a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 16:12:26 2017 +0100 changed noblank to blank=minutes (0 turns feature off, along with dpms) --- .../lib/live/config/2800-x2go-thinclientconfig | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 79c5681..1275f26 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -244,10 +244,17 @@ else LDAPPARAMS="" fi -if grep -q '\W*noblank\W*' /proc/cmdline; then - # Disable screensaver and DPMS Power Saving if requested - xset s off - xset -dpms +BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }') +if [ -n "\$BLANKINGTIME" ]; then + if [ \$BLANKINGTIME -eq 0 ]; then + # Disable screensaver and DPMS Power Saving if requested + xset s off + xset -dpms + else + xset s on + xset s \$BLANKINGTIME + xset +dpms + fi fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 7274f5e36c4cacea1821864218d5fed755cd89a3 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Dec 22 15:56:38 2016 +0100 openbox configuration refined and documented --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 77cfc16..4f1b98e 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -15,6 +15,7 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml # disable OpenBox context menu (would be accessible in xinerama) sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations +<<<<<<< HEAD ======= echo -n " x2gothinclientconfig" ======= @@ -22,6 +23,8 @@ echo -n " x2go-thinclientconfig"
> fa6f730... Startup display message changed
> dd779e0... typofix, and different invocation of pulseaudio +======= +>>>>>>> df4ed87... openbox configuration refined and documented sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml
cat >/home/user/.xsession <<XSESSION -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 315791b7ece60b484742f8ef12e139b248d3c4cf Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 19:27:33 2016 +0100 added option to disable screen blanking --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 4f1b98e..4f08c48 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -243,7 +243,13 @@ if [ -n "\$LDAP" ] ; then else LDAPPARAMS="" fi - + +if grep -q '\Wnoblank\W' /proc/cmdline; then + # Disable screensaver and DPMS Power Saving if requested + xset s off + xset -dpms +fi + x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM
> f495c9f... added support for passing of LDAP parameters XSESSION
-- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit d59299f11aa5faf4227ff05f93d058de65ff331c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Dec 22 01:15:25 2016 +0100 fixed further perlisms --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 32b9519..77cfc16 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -95,8 +95,8 @@ ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-nati pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 &
> f17b900... moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now
-# additional variable instead of "case $(...) in", as we need the value again later on -XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '$''1 == "xinerama" { print $''2 }') +# additional variable instead of "case \$(...) in", as we need the value again later on +XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "xinerama" { print \$2 }') # sanitize input case \$XRANDRCMDTAINTED in -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 07878a4e20ec370babb595b2764e24df466a3bc7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 20:21:23 2016 +0100 fixed whitespace detection around cmdline parameters --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 4f08c48..79c5681 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -244,7 +244,7 @@ else LDAPPARAMS="" fi -if grep -q '\Wnoblank\W' /proc/cmdline; then +if grep -q '\W*noblank\W*' /proc/cmdline; then # Disable screensaver and DPMS Power Saving if requested xset s off xset -dpms -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit e6ad5565dbd4df920b6b9a4542553d11ce543e57 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 20:21:30 2017 +0100 changed blank/nodpms parameters --- .../lib/live/config/2800-x2go-thinclientconfig | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 1275f26..899522a 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -246,14 +246,19 @@ fi BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }') if [ -n "\$BLANKINGTIME" ]; then - if [ \$BLANKINGTIME -eq 0 ]; then + DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print $1 " " $2 " " $3}')) + if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off - xset -dpms + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + xset -dpms + fi else xset s on - xset s \$BLANKINGTIME - xset +dpms + xset s \${DPMSARR[0]} + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + xset +dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} + fi fi fi -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 74d354c84196b097f04ac8e658b3982eb29d973e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 15 17:37:11 2017 +0100 added parameter and directory creation for filesharing support --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 1f517a0..d6edb63 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -263,12 +263,18 @@ if [ -n "\$BLANKINGTIME" ]; then fi fi +<<<<<<< HEAD x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM
> f495c9f... added support for passing of LDAP parameters +======= +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM +>>>>>>> 75c7143... added parameter and directory creation for filesharing support XSESSION
chown user:user /home/user/.xsession chmod 644 /home/user/.xsession +mkdir -p /home/user/export +mkdir -p /home/user/logins <<<<<<< HEAD <<<<<<< HEAD -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit feb1fbea33874d08bb80e46d7d0090dcf83881f2 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 29 13:27:16 2017 +0100 File Sharing wasn't working - ownership/permissions issue fixed now --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index d6edb63..0247e07 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -273,8 +273,11 @@ XSESSION chown user:user /home/user/.xsession chmod 644 /home/user/.xsession -mkdir -p /home/user/export -mkdir -p /home/user/logins + +# This is needed for File Sharing support (USB media and the like) +mkdir -p /home/user/{export,logins,mounts} +chown user:user /home/user/{export,logins,mounts} +chmod 777 /home/user/{export,logins,mounts} <<<<<<< HEAD <<<<<<< HEAD -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 6043b332c98c87370e150604faab99e79184c904 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 29 14:53:42 2017 +0100 permissions were wrong again (777), must be 700 --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 0247e07..0c8cc86 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -277,7 +277,7 @@ chmod 644 /home/user/.xsession # This is needed for File Sharing support (USB media and the like) mkdir -p /home/user/{export,logins,mounts} chown user:user /home/user/{export,logins,mounts} -chmod 777 /home/user/{export,logins,mounts} +chmod 700 /home/user/{export,logins,mounts} <<<<<<< HEAD <<<<<<< HEAD -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 7173d4c147ee30ced7890fcc94c4ab9e1b0be187 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 23:48:40 2017 +0100 fix dpms call --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 3801643..1f517a0 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -257,7 +257,8 @@ if [ -n "\$BLANKINGTIME" ]; then xset s on xset s \${DPMSARR[0]} if ! grep -q '\W*nodpms\W*' /proc/cmdline; then - xset +dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} + # Yes, "+dpms dpms" is intentional. + xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} fi fi fi -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 6221baf2e21f97277312f3cd258e4d9f6240ca2a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 21:58:46 2017 +0100 typofix, forgot escapes --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 899522a..3801643 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -246,7 +246,7 @@ fi BLANKINGTIME=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "blank" { print \$2 }') if [ -n "\$BLANKINGTIME" ]; then - DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print $1 " " $2 " " $3}')) + DPMSARR=(\$(echo \$BLANKINGTIME | awk -F ':' '\$1 ~/^[0-9]*\$/ && \$2 ~/^[0-9]*\$/ && \$3 ~/^[0-9]*\$/ { print \$1 " " \$2 " " \$3}')) if [ \${DPMSARR[0]} -eq 0 ]; then # Disable screensaver and DPMS Power Saving if requested xset s off -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 7c18e94f342009eab0d61f5b1a7f8af12b05f38b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Apr 24 16:17:40 2017 +0200 2800-x2go-thinclientconfig: added quotation marks --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 1be0d3f..7e0e4de 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -74,7 +74,7 @@ for NEXT_DISPLAY in \$(LANG=C xrandr 2>/dev/null | grep ' connected ' | cut -d ' # THIS_DISPLAY won't be defined until the second time the loop is executed, which is a # neat way of running xrandr only if there are at least two connected display devices - if [ -n \${THIS_DISPLAY+x} ] ; then + if [ -n "\${THIS_DISPLAY+x}" ] ; then if [ \$TOUCHDEVICESCOUNT -gt 0 ] && [ \$MICECOUNT -lt 1 ] && [ -z \$XRANDRCMDTAINTED ]; then # we have a touch device and no mice, and no xinerama parameter was set, -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit ea907f01c41ec9d89a6a78626b409124b34da867 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Feb 25 12:37:53 2017 +0100 make sure Alt-F4 is non-functional --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 0c8cc86..87a9799 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -14,6 +14,8 @@ echo -n " x2go-thinclientconfig" sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml # disable OpenBox context menu (would be accessible in xinerama) sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml +# disable OpenBox Alt-F4 +sed -i -e '/<keybind key="A-F4">/,+3d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations <<<<<<< HEAD ======= -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit 184f9f726c4b2c662b0ccfb1a67696b93caf7fec Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Feb 25 13:47:40 2017 +0100 off-by-one-error --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 87a9799..525ca1b 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -15,7 +15,7 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml # disable OpenBox context menu (would be accessible in xinerama) sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # disable OpenBox Alt-F4 -sed -i -e '/<keybind key="A-F4">/,+3d' /etc/xdg/openbox/rc.xml +sed -i -e '/<keybind key="A-F4">/,+2d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations <<<<<<< HEAD ======= -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/fvwm in repository live-build-x2go. commit a36c17cbe8de1349b8b00111adad3428cc44efcb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Feb 26 18:02:54 2017 +0100 OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 525ca1b..1be0d3f 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -12,10 +12,9 @@ echo -n " x2go-thinclientconfig" # using xmlstarlet would mean wasting yet another Megabyte of space ... # disable virtual desktops sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml -# disable OpenBox context menu (would be accessible in xinerama) -sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml -# disable OpenBox Alt-F4 -sed -i -e '/<keybind key="A-F4">/,+2d' /etc/xdg/openbox/rc.xml +# disable OpenBox keyboard bindings +# this also disables the context menu (would be accessible in xinerama) and things like Alt-F4 for X2GoClient, Xephyr, etc. +sed -i -e '/<keyboard>/,/<\/keyboard>/{//!d}' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations <<<<<<< HEAD ======= -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
-
git-admin＠x2go.org