This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit c8d334b9bf6b0c5c9f4e67eba6c3482af17c84d7 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/openbox in repository live-build-x2go. commit 09bf7829f4e14053e36a78f87148cccf60eee7f3 Author: Juri Grabowski <git-commit@jugra.de> Date: Mon Jun 20 16:45:29 2016 +0200 stripdown --- config/includes.chroot/etc/system.fvwm2rc | 33 ----------------------------- config/package-lists/desktop.list.chroot | 2 +- config/package-lists/utils.list.chroot | 2 +- config/package-lists/x2go.list.chroot | 2 +- 4 files changed, 3 insertions(+), 36 deletions(-) diff --git a/config/includes.chroot/etc/system.fvwm2rc b/config/includes.chroot/etc/system.fvwm2rc deleted file mode 100644 index 1513492..0000000 --- a/config/includes.chroot/etc/system.fvwm2rc +++ /dev/null @@ -1,33 +0,0 @@ -DesktopSize 1x1 - -AddToFunc InitFunction -+ I exec xset -b & -+ I Module FvwmCommandS -+ I Module FvwmEvent -+ I exec x2goclient --thinclient --add-to-known-hosts --link=lan --haltbt --clipboard=both --pack=16m-png-9 --session-conf=/etc/x2go/x2gothinclient_sessions & -+ I exec FvwmCommand Restart & - -Style "*" SkipMapping -Style "*" !UsePPosition, !UseUSPosition -Style "*" BorderWidth 1, HandleWidth 1 - -ButtonStyle 3 12 10x50@1 35x25@1 35x40@1 65x40@1 65x25@1 90x50@1 65x75@0 65x60@0 35x60@0 35x75@0 10x50@0 10x50@1 -ButtonStyle 5 12 50x10@1 25x35@1 40x35@1 40x60@1 25x60@1 50x85@1 75x60@0 60x60@0 60x35@0 75x35@0 50x10@0 50x10@1 -ButtonStyle 8 15 10x5@1 90x5@1 90x20@0 50x20@0 50x25@0 80x55@0 60x55@0 60x90@0 40x90@0 40x55@1 20x55@1 50x25@1 50x20@0 10x20@0 10x5@1 -ButtonStyle 6 5 45x45@1 55x45@1 55x55@0 45x55@0 45x45@1 -ButtonStyle 4 5 25x25@1 25x75@1 75x75@0 75x25@0 25x25@1 -ButtonStyle 2 13 26x29@1 34x21@1 50x35@1 70x21@1 79x29@1 63x48@0 79x65@1 70x75@0 50x61@0 34x75@0 26x65@0 44x48@1 26x29@0 -ButtonStyle 1 MiniIcon - -Mouse 0 2 A Close -Mouse 0 4 A Maximize -Mouse 0 6 A Iconify -Mouse 0 8 A Nop - -Mouse 0 1 A Nop -Mouse 0 3 A Nop -Mouse 0 5 A Nop -Mouse 0 7 A Nop - -AddToFunc Default_keys -Key T A 4 Exec xterm diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index d554295..43adbde 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1 +1 @@ -xserver-xorg-video-all xserver-xorg fvwm nodm xterm synergy aptitude xdmx-tools xdmx +xserver-xorg-video-all xserver-xorg nodm xterm diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index 7f96bf1..d9a053f 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -psmisc vim screen xdotool +psmisc vim screen diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 6f268aa..496e6a3 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1 +1 @@ -x2goclient rdesktop vncviewer +x2goclient -- 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/openbox in repository live-build-x2go. commit ce0e1a50512d0f37bb5a0ee0650a3a52138ed36e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 19:02:03 2016 +0200 Introduces Powerbutton Monitor and Sound Support --- config/package-lists/x2go.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 496e6a3..f044dbd 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1 +1 @@ -x2goclient +x2goclient inotify-tools pulseaudio alsa-utils -- 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/openbox in repository live-build-x2go. commit f437d32c62f8a3514db5df2aaf8774b0b25ee1c8 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Mon Jun 20 16:54:50 2016 +0200 ipconfig --- .../includes.chroot/lib/live/config/2000-ipconfig | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2000-ipconfig b/config/includes.chroot/lib/live/config/2000-ipconfig new file mode 100644 index 0000000..fb108ea --- /dev/null +++ b/config/includes.chroot/lib/live/config/2000-ipconfig @@ -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/openbox in repository live-build-x2go. commit fe0685ee22fe8474ffc420915184ab8990e61f2c Author: Juri Grabowski <git-commit@jugra.de> Date: Mon Jun 20 17:52:30 2016 +0200 just jessie i386 --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index b759dab..5b66c54 100644 --- a/README.txt +++ b/README.txt @@ -43,7 +43,7 @@ IP_OF_FQDN=`dig $FQDN +short` DIR=/srv/live-build-x2go-`date +"%Y%m%d%H%M%S"` mkdir $DIR cd $DIR -lb config --chroot-filesystem squashfs --apt-indices none --cache-packages false --config https://github.com/LinuxHaus/live-build-x2go.git --archive-areas "main contrib non-free" --apt-recommends true --firmware-binary true --updates true --backports true --win32-loader false --loadlin false --security true --initsystem systemd -b netboot -a i386 -k amd64 --linux-packages linux-image --bootappend-live aufs rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vconsole.keymap=de-latin1-nodeadkeys kernel.s [...] +lb config --chroot-filesystem squashfs --apt-indices none --cache-packages false --config https://github.com/LinuxHaus/live-build-x2go.git::mini --archive-areas "main contrib non-free" --apt-recommends true --firmware-binary true --updates true --backports true --win32-loader false --loadlin false --security true --initsystem systemd -b netboot -d jessie -a i386 -k 586 --linux-packages linux-image --bootappend-live aufs rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 vconsole.keymap=de-latin1-node [...] lb build cd `dirname $DIR` ln -s `basename $DIR` lb-x2go -- 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/openbox in repository live-build-x2go. commit 1bfcac29791245935795baee63732f6929f499bc Author: Juri Grabowski <git-commit@jugra.de> Date: Mon Jun 20 19:31:33 2016 +0200 ipconfig need wget --- config/package-lists/utils.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index d9a053f..4f7c8bd 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -psmisc vim screen +psmisc vim screen wget -- 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/openbox in repository live-build-x2go. commit e29873d2d131274348175ac7a1dea03117452ee9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 19:00:51 2016 +0200 This is a background task to monitor the halt button displayed in x2goclient with --haltbt --- .../lib/live/config/2700-x2go-powerbuttonmonitor | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2700-x2go-powerbuttonmonitor b/config/includes.chroot/lib/live/config/2700-x2go-powerbuttonmonitor new file mode 100644 index 0000000..64438d5 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2700-x2go-powerbuttonmonitor @@ -0,0 +1,21 @@ +#!/bin/sh + +X2GoPowerbuttonMonitor () +{ +# Output startup message +# +echo -n " x2go-powerbuttonmonitor" + +# Spawn Powerbutton-Monitor +( + rm -f /home/user/.halt + inotifywait -mrq -e create /home/user/ | grep -q "CREATE .halt" && ( + killall X ; + poweroff ; + chvt 7 + ) +) & + +} + +X2GoPowerbuttonMonitor -- 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/openbox in repository live-build-x2go. commit f17b90078ae8a061de8731f0194c7b215322f225 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 | 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/openbox in repository live-build-x2go. commit 67f6917b7b52a78ea9265c396218f5d45f1469e4 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 21 21:47:02 2016 +0200 moved openbox from utils to desktop (all other X-related stuff is already there) --- config/package-lists/desktop.list.chroot | 2 +- config/package-lists/utils.list.chroot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index 43adbde..fdc5c81 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1 +1 @@ -xserver-xorg-video-all xserver-xorg nodm xterm +xserver-xorg-video-all xserver-xorg nodm openbox xterm diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index 7542479..d9a053f 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -psmisc vim screen openbox +psmisc vim screen -- 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/openbox in repository live-build-x2go. commit afb81c790b150cfca870b2fff2cd5c91fe346782 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jun 22 10:53:29 2016 +0200 Added kbd package for l10n of console --- config/package-lists/utils.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index d9a053f..a07d6e1 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -psmisc vim screen +psmisc vim screen kbd -- 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/openbox in repository live-build-x2go. commit f495c9f2309242da87069409ffdb9548d9bdcff2 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/openbox in repository live-build-x2go. commit 3206bc8fcf7302f83dde2c5bca21f5b93c2c7c15 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jun 22 11:53:34 2016 +0200 Removed plymouth again, caused nothing but trouble --- config/package-lists/desktop.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index 7daaede..fdc5c81 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1 +1 @@ -xserver-xorg-video-all xserver-xorg nodm openbox plymouth plymouth-themes plymouth-x11 xterm +xserver-xorg-video-all xserver-xorg nodm openbox xterm -- 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/openbox in repository live-build-x2go. commit 97362822167ea917dc52f25d7b782b169f166030 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 --- .../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/openbox in repository live-build-x2go. commit ef0b1e3aea67876325b05ea18b95224bf93ad955 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jul 12 18:10:30 2016 +0200 this script works like x2go-getsessions - upon detecting kernel parameter xorgconfurl=..., it tries to fetch an xorg.conf from there and installs it before X starts --- .../lib/live/config/2200-x11-getxorgconf | 45 ++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2200-x11-getxorgconf b/config/includes.chroot/lib/live/config/2200-x11-getxorgconf new file mode 100755 index 0000000..d28bf04 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2200-x11-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