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. discards 7c18e94 2800-x2go-thinclientconfig: added quotation marks discards a36c17c OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. discards 184f9f7 off-by-one-error discards ea907f0 make sure Alt-F4 is non-functional discards 6043b33 permissions were wrong again (777), must be 700 discards feb1fbe File Sharing wasn't working - ownership/permissions issue fixed now discards 74d354c added parameter and directory creation for filesharing support discards 7173d4c fix dpms call discards 6221baf typofix, forgot escapes discards e6ad556 changed blank/nodpms parameters discards e7a05fd changed noblank to blank=minutes (0 turns feature off, along with dpms) discards 07878a4 fixed whitespace detection around cmdline parameters discards 315791b added option to disable screen blanking discards 7274f5e openbox configuration refined and documented discards d59299f fixed further perlisms discards 3cc2198 fixed various syntax errors stemming from perl->bash conversion discards c4161a2 added multiscreen/xinerama support discards 05e845f added support for passing of LDAP parameters discards 7559adb Startup display message changed discards e9512f1 Removed amixer calls, did not work anyways discards e1d5272 moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now discards b8d2e53 moved audio volume presets to xsession - seems to require running PA discards 5961474 typofix, and different invocation of pulseaudio discards 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, discards 8f900a7 whitespace fix discards f20c468 Position of SESSIONSDESTINATION variable was wrong, which caused it to be empty later on discards 9f7c98a x2go-getsessions discards 1923c4b name change discards aeaebd9 name change discards 5f1140e name change discards f7c6c16 name change discards 21a918f fixed whitespace detection around cmdline parameters new a15297c fixed whitespace detection around cmdline parameters new acaeb43 name change new 8f795c1 name change new ab7a3f7 name change new 616be9d name change new b3203c3 x2go-getsessions new 217b2ab Position of SESSIONSDESTINATION variable was wrong, which caused it to be empty later on new 0bf5dcf whitespace fix new cceeb39 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 3410952 typofix, and different invocation of pulseaudio new 1647ff3 moved audio volume presets to xsession - seems to require running PA new 653dc50 moved amixer calls to startup script and changed pulseaudio spawn - wouldn't work otherwise, hopefully does now new b475987 Removed amixer calls, did not work anyways new c7ef738 Startup display message changed new cbad810 added support for passing of LDAP parameters new 02267a7 added multiscreen/xinerama support new ac0454f fixed various syntax errors stemming from perl->bash conversion new 9e20225 fixed further perlisms new 8c14a77 openbox configuration refined and documented new 446608b added option to disable screen blanking new 1f49632 fixed whitespace detection around cmdline parameters new cd29267 changed noblank to blank=minutes (0 turns feature off, along with dpms) new dfe4ddb changed blank/nodpms parameters new bfa3531 typofix, forgot escapes new e50389d fix dpms call new 50fa64d added parameter and directory creation for filesharing support new 1f0b75d File Sharing wasn't working - ownership/permissions issue fixed now new 7567dc4 permissions were wrong again (777), must be 700 new c2fa85d make sure Alt-F4 is non-functional new 6d38764 off-by-one-error new 2fb7edb OpenBox Keybindings need to be disabled entirely, they interfere with Xephyr and the like. new 6d4ab7c 2800-x2go-thinclientconfig: added quotation marks new 7732368 unretab 2100-lockuser new 3c952a6 unretab 2150-getsshpubkeysfromserver new 3debb67 unretab 2200-xserver-xorg-getxorgconf new 0ee146b unretab 2600-x2go-getsessions new 65f54bb unretab 2800-x2go-thinclientconfig new aff1f08 no needs for loop, because it is ifup script + colorized interface names, MACs and link state This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7c18e94) \ N -- N -- N refs/heads/feature/fvwm (aff1f08) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 38 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 | 16 +- .../includes.chroot/lib/live/config/2100-lockuser | 2 +- .../lib/live/config/2150-getsshpubkeysfromserver | 44 ++-- .../lib/live/config/2200-xserver-xorg-getxorgconf | 2 +- .../lib/live/config/2600-x2go-getsessions | 22 +- .../lib/live/config/2800-x2go-thinclientconfig | 268 +++++---------------- 6 files changed, 101 insertions(+), 253 deletions(-) -- 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 a15297c5e3c3107f648804e9ba9737c56f7437b9 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/2100-lockuser | 2 +- 1 file changed, 1 insertion(+), 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 -- 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 acaeb43b3e076a0636c3b36abee3cb3dd0e41471 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 8f795c1ce2b4026d3b2e49a7b8882e106ebfd58c 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 ab7a3f7ec83e828de55998c203bc38defe586e0d 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 616be9d910da64aaa4a2d8cf8944a1df3928d8be 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 b3203c30db440f8d0263733dbbd25ff8e980c49d 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 217b2ab0274139401a074c5a8a5d9052b1039607 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 cceeb3948dae6147a0957b393fca528ff4527a60 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 0bf5dcf0c8b89c3485bf0e1dbb00f5e23338a945 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 34109529ebd2fc2f1f069fd042ed83776b8790ff 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 | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) 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..dba03fc --- /dev/null +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -0,0 +1,36 @@ +#!/bin/bash + +X2GoThinClientConfig () +{ + +# Output startup message +# +echo -n " x2gothinclientconfig" + +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 +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")& + +# Spawn openbox +openbox & + +# Spawn X2GoClient +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions +XSESSION + +chown user:user /home/user/.xsession +chmod 644 /home/user/.xsession + +# Set Audio Volume +amixer -q sset Master 100 +amixer -q sset PCM 100 + +} + +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 1647ff32fcdcb98db88f8e429233d9046210fcf0 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 --- config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 8 ++++---- 1 file changed, 4 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 dba03fc..556888f 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 @@ ps -C pulseaudio --no-headers || (su - user -c "pulseaudio -D -n -L 'module-nati # Spawn openbox openbox & +# Set Audio Volume +amixer -q sset Master 100 +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 XSESSION @@ -27,10 +31,6 @@ XSESSION chown user:user /home/user/.xsession chmod 644 /home/user/.xsession -# Set Audio Volume -amixer -q sset Master 100 -amixer -q sset PCM 100 - } 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 b4759875a0e6cae41138749499dea94d8257f111 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 3ba329c..a1eed80 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -9,10 +9,6 @@ echo -n " x2gothinclientconfig" 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 653dc5097ec4bfb2e5fcf9ab82ed3af3be11d71b 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 --- .../includes.chroot/lib/live/config/2800-x2go-thinclientconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 556888f..3ba329c 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -9,21 +9,21 @@ echo -n " x2gothinclientconfig" 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... # check the above file for ideas before reinventing the wheel # Spawn PulseAudio -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")& +pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & # Spawn openbox openbox & -# Set Audio Volume -amixer -q sset Master 100 -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 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 cbad81022af10e48caf5d8ac405a4e10eef7320f 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 | 37 +++++++++++++++++++++- 1 file changed, 36 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 cdf76c0..6efdc18 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -20,8 +20,43 @@ pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detec # Spawn openbox openbox & + +# 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 -x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --session-conf=/etc/x2go/x2gothinclient_sessions +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 + +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM 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 c7ef738e51f8c7f41b25aa8d8dadfc95e1bdf44a 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 | 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 a1eed80..cdf76c0 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -5,7 +5,7 @@ X2GoThinClientConfig () # Output startup message # -echo -n " x2gothinclientconfig" +echo -n " x2go-thinclientconfig" 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 02267a7ecc9088e58aa80ea8c69cb6926009e8de 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 6efdc18..019a6b6 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -17,6 +17,64 @@ cat >/home/user/.xsession <<XSESSION # 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 + +# 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 9e202258bdabd18908486b9c039bb4e01bc536e5 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 fca482e..0c6a163 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -17,8 +17,8 @@ cat >/home/user/.xsession <<XSESSION # 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 }') +# 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 ac0454f02be9a8b453cebf4e5d1162028dac24bb 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 | 17 ++++++++--------- 1 file changed, 8 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 019a6b6..fca482e 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -18,10 +18,10 @@ cat >/home/user/.xsession <<XSESSION 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 }') +XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '$''1 == "xinerama" { print $''2 }') # sanitize input -case $XRANDRCMDTAINTED in +case \$XRANDRCMDTAINTED in "above") XRANDRCMD="above" ;; @@ -40,10 +40,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 @@ -63,21 +63,20 @@ 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 & +# set screen background to X2Go default blue on all detected screens +xsetroot -solid "#246ed8" # 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 8c14a77a7742c8b41e458d616751f1f64fb3b17e 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 | 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 0c6a163..26875f7 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -7,6 +7,12 @@ X2GoThinClientConfig () # 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 -- 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 1f4963260c82e21540a306a71c1fc56a2a43bf06 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 a697138..76e254f 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -119,7 +119,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 446608b25f8bef7b71d99c5d89e0304c549f536b 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 26875f7..a697138 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -118,7 +118,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 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 dfe4ddbc5511a4ba756be0e2ecd7425159ec1eaa 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 05051a7..acd072c 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -121,14 +121,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 cd29267311100676168bec56b53b13381f60e426 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 76e254f..05051a7 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -119,10 +119,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 e50389dda0bf1ea19c1d6776e66bba01a6ebf567 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 4338a1f..8da7bb1 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -132,7 +132,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 bfa3531c6f4c551ddee1a6ef64e3f1defdd858e8 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 acd072c..4338a1f 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -121,7 +121,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 6d4ab7c5e7a5b0d87bc9e17fb0ed2b6416df607c 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 981e002..0aca654 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -60,7 +60,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 50fa64dc0ce8cb53dcd4ccba56eaaba1b30c916a 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 | 4 +++- 1 file changed, 3 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 8da7bb1..8507373 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -138,11 +138,13 @@ if [ -n "\$BLANKINGTIME" ]; then fi fi -x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt \$LDAPPARAMS \$SESSIONFROM +x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$LDAPPARAMS \$SESSIONFROM XSESSION chown user:user /home/user/.xsession chmod 644 /home/user/.xsession +mkdir -p /home/user/export +mkdir -p /home/user/logins } -- 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 7567dc412901e0134705915960ac349d6e963e67 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 e0fdbcc..2bb146b 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -147,7 +147,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} } -- 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 c2fa85de4bf3798a3ab2b47eae161bb7cbf3f064 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 2bb146b..e576baa 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -12,6 +12,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 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 2fb7edb1203e7e1508e21ebec77ddc1b07ba12fb 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 93f45a7..981e002 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -10,10 +10,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 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 6d38764c153cf54e68bf7f5731533e5a9cc6ed56 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 e576baa..93f45a7 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -13,7 +13,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 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 1f0b75dbac7e4c5118a9c1283bf4d4926242df40 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 8507373..e0fdbcc 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -143,8 +143,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} } -- 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 773236806a6389448e1f880c3da1d4e81d564600 Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:48:14 2017 +0200 unretab 2100-lockuser --- config/includes.chroot/lib/live/config/2100-lockuser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2100-lockuser b/config/includes.chroot/lib/live/config/2100-lockuser index 1cbcc15..81e49d9 100755 --- a/config/includes.chroot/lib/live/config/2100-lockuser +++ b/config/includes.chroot/lib/live/config/2100-lockuser @@ -11,7 +11,7 @@ echo -n " lockuser" # Set password # if grep -q "\W*nouser\W*" /proc/cmdline ; then - passwd -l user >/dev/null + passwd -l user >/dev/null 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 3debb67823392097781e8537f20f01922ed52996 Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:48:14 2017 +0200 unretab 2200-xserver-xorg-getxorgconf --- config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2dd20da..92241f2 100755 --- a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf +++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf @@ -10,7 +10,7 @@ echo -n " xserver-xorg-getxorgconf" tr ' ' '\n' | \ awk -F'=' ' /^xorgconfurl=/ { print $2 }') if [ -n "$XORGCONFURL" ] && [ -d /etc/X11 ] ; then - XORGCONFDESTINATION=/etc/X11/xorg.conf.new + XORGCONFDESTINATION=/etc/X11/xorg.conf.new cat >/etc/network/if-up.d/getxorgconf <<GETXORG #!/bin/bash export TERM=linux; -- 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 3c952a6eeceb0100b09698dea70c665e0da9a62f Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:48:14 2017 +0200 unretab 2150-getsshpubkeysfromserver --- .../lib/live/config/2150-getsshpubkeysfromserver | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver index e613d35..5d6ca0e 100755 --- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver +++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver @@ -3,17 +3,17 @@ GetSSHPubKeysFromServer () { - # Output startup message - # - echo -n " getsshpubkeysfromserver" + # Output startup message + # + echo -n " getsshpubkeysfromserver" - PUBKEYURL=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^pubkey=/ { print $2 }') + PUBKEYURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^pubkey=/ { print $2 }') - if [ -n "$PUBKEYURL" ] ; then - cat >/etc/network/if-up.d/getsshpubkeysfromserver <<GETPUBKEY + if [ -n "$PUBKEYURL" ] ; then + cat >/etc/network/if-up.d/getsshpubkeysfromserver <<GETPUBKEY #!/bin/bash export TERM=linux; @@ -29,24 +29,24 @@ 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 + 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 + 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/getsshpubkeysfromserver - fi + chmod 755 /etc/network/if-up.d/getsshpubkeysfromserver + 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 65f54bbe54559d916e6484a043be15382bcdbed0 Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:48:14 2017 +0200 unretab 2800-x2go-thinclientconfig --- .../lib/live/config/2800-x2go-thinclientconfig | 128 ++++++++++----------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig index 0aca654..6ccf009 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig @@ -30,20 +30,20 @@ XRANDRCMDTAINTED=\$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '\$1 == "xinera # sanitize input case \$XRANDRCMDTAINTED in "above") - XRANDRCMD="above" - ;; + XRANDRCMD="above" + ;; "below") - XRANDRCMD="below" - ;; + XRANDRCMD="below" + ;; "same-as") - XRANDRCMD="same-as" - ;; + XRANDRCMD="same-as" + ;; "right-of") - XRANDRCMD="right-of" - ;; + XRANDRCMD="right-of" + ;; *) - XRANDRCMD="left-of" # default - ;; + XRANDRCMD="left-of" # default + ;; esac # find out how many touch devices we have @@ -55,28 +55,28 @@ 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'} + #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 + # 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 + 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 + 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 + # 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 @@ -87,56 +87,56 @@ xsetroot -solid "#246ed8" # Get X2GoConfig BROKERURL=\$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^broker-url=/ { print \$2 }') + tr ' ' '\n' | \ + awk -F'=' ' /^broker-url=/ { print \$2 }') LDAP=\$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - sed 's/^ldap=/ldap#/' | \ - awk -F'#' ' /^ldap#/ { print \$2 }') + 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 }') + 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 }') + tr ' ' '\n' | \ + sed 's/^ldap2=/ldap2#/' | \ + awk -F'#' ' /^ldap2#/ { print \$2 }') # Spawn X2GoClient if [ -n "\$BROKERURL" ]; then - SESSIONFROM="--broker-url=\$BROKERURL" + SESSIONFROM="--broker-url=\$BROKERURL" else - SESSIONFROM="--session-conf=/etc/x2go/x2gothinclient_sessions" + 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" + if [ -n "\$LDAP1" ] ; then + BACKUPLDAP="--ldap1=\$LDAP1" + if [ -n "\$LDAP2" ] ; then + BACKUPLDAP="\$BACKUPLDAP --ldap2=\$LDAP2" + fi + fi + LDAPPARAMS="--ldap=\$LDAP \$BACKUPLDAP" else - LDAPPARAMS="" + LDAPPARAMS="" 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}')) - if [ \${DPMSARR[0]} -eq 0 ]; then - # Disable screensaver and DPMS Power Saving if requested - xset s off - if ! grep -q '\W*nodpms\W*' /proc/cmdline; then - xset -dpms - fi - else - xset s on - xset s \${DPMSARR[0]} - if ! grep -q '\W*nodpms\W*' /proc/cmdline; then - # Yes, "+dpms dpms" is intentional. - xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} - fi - fi + 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 + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + xset -dpms + fi + else + xset s on + xset s \${DPMSARR[0]} + if ! grep -q '\W*nodpms\W*' /proc/cmdline; then + # Yes, "+dpms dpms" is intentional. + xset +dpms dpms \${DPMSARR[0]} \${DPMSARR[1]} \${DPMSARR[2]} + fi + fi fi x2goclient --thinclient --no-session-edit --no-menu --maximize --add-to-known-hosts --haltbt --read-exports-from=/home/user/export \$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 0ee146b693e9937a691779408b1d52c3230b9c85 Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:48:14 2017 +0200 unretab 2600-x2go-getsessions --- .../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 74524fc..e6fa07b 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 aff1f086fd63c84df345b7b9fd081eb5e12ddc8c Author: Juri Grabowski <gratuxri@gmail.com> Date: Fri Apr 28 11:55:36 2017 +0200 no needs for loop, because it is ifup script + colorized interface names, MACs and link state --- config/includes.chroot/lib/live/config/2000-showifconfig | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig index 20896d4..ef23f88 100755 --- a/config/includes.chroot/lib/live/config/2000-showifconfig +++ b/config/includes.chroot/lib/live/config/2000-showifconfig @@ -16,20 +16,8 @@ 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 +ip -c a >> /etc/issue; +ip -c a >> /etc/issue.net SHOWIPS chmod 755 /etc/network/if-up.d/showips -- 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