This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox in repository live-build-x2go. from db06cd4 removed inotify, no longer needed, never worked for us new bd09ef7 added a few packages as required, to see if we can build with "apt-recommends false" new 5dfd7be added tcp printing feature new b12987b added patch to share session config between X2GoClient for Windows in portable mode and X2Go-TCE isohybrid residing on same USB media new 61bf0a1 added patch to share ssh secret keys between X2GoClient for Windows in portable mode and X2Go-TCE isohybrid residing on same USB media new 99c49e5 trying to get live-tools included into the final image new 6bc9323 switched to one package name per line new 25d3af2 switched to one package name per line new cdcc320 switched to one package name per line new 41b1b09 switched to one package name per line new 1fe2775 moved x-related packages to desktop.list.chroot new 54a63cc added more packages to make system useable when useing apt-recommmends false new 976c51a added ssh and wget packages so image works even with apt-recommends false new a6e2ab5 added packages for rdp support and additional packages for pulseaudio when using apt-recommends false new 295ba4f sudo was still missing when using apt-recommends false new 6075c4e add ntfs read-write support new c769c42 added option to disable screen blanking new 84bb715 fixed whitespace detection around cmdline parameters new 8bc2277 typofixes new 707dbd1 make autoupdater wait until tty10 becomes available new c65cb02 fixed whitespace detection around cmdline parameters new c61268e changed path-/filenames etc. to X2Go/x2go-tce prefix new f07bcf4 changed noblank to blank=minutes (0 turns feature off, along with dpms) new 6871d50 changed blank/nodpms parameters new 87c093a typofix, forgot escapes new 27cf27f fix dpms call new fe0d89d added support for incomplete and dash-separated ntfs uuids new 2f69cea name change new 236d844 name change new 81c2ff5 added some status messages and error checking new 5dfa60a name change new 7b2b24a name change new b744314 name change new 827bfbe name change new ea25162 name change new 1f1926f name change new ebd3f74 name change new 3ec1530 added support for updatesleep parameter new 6154bc2 name change new 7a8f5fe name change, adapted to work with new TCE new 7f4f971 name change new 0ce542f name change new 01e3ce6 name change, adapted to work with new TCE new 631b1c6 undid path change new f56007e name change new 5695de5 name change new 792bff2 detection of NTFSROOT when given an incomplete UUID would fail new 19bff46 fixed calculation error - lower limit for maximum sleep time must be 240, as 239 might be a valid result when calculating the minimum sleep time new 33d84f7 -e was missing at echo, thus literal backslash n was being printed new ec205de added httpfs, ftpfs, nfs support new f510ac8 added usbmount and pinentry support new 981c5fb typofix new ac2ebc4 wget output is different for ftp, changes to SIZEFACTORSTRING and DLRATE required new 3a58f19 changed wget output to progress bar style in all cases new 5e4ceb9 added ca-certificates for wget ssl support new 60ef137 removed curlftpfs, not needed new 75c7143 added parameter and directory creation for filesharing support new 1987372 File Sharing wasn't working - ownership/permissions issue fixed now new e4cfc12 permissions were wrong again (777), must be 700 The 58 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: .../config/{2000-ipconfig => 2000-showifconfig} | 6 +- .../includes.chroot/lib/live/config/2100-lockuser | 2 +- ...2150-setsshkey => 2150-getsshpubkeysfromserver} | 10 +- ...1-getxorgconf => 2200-xserver-xorg-getxorgconf} | 6 +- .../{2300-autoupdate => 2300-live-autoupdate} | 117 +++++++++++++------- .../live/config/2400-x2go-getportableappsessions | 23 ++++ .../config/2410-x2go-getopensshportableclientkey | 46 ++++++++ .../includes.chroot/lib/live/config/2500-tcpprint | 76 +++++++++++++ .../lib/live/config/2800-x2go-thinclientconfig | 28 ++++- config/package-lists/desktop.list.chroot | 11 +- config/package-lists/firmware.list.chroot | 8 +- config/package-lists/live.list.chroot | 16 +++ config/package-lists/ntfs.list.chroot | 6 + config/package-lists/utils.list.chroot | 16 ++- config/package-lists/x2go.list.chroot | 54 ++++++++- 15 files changed, 368 insertions(+), 57 deletions(-) rename config/includes.chroot/lib/live/config/{2000-ipconfig => 2000-showifconfig} (94%) rename config/includes.chroot/lib/live/config/{2150-setsshkey => 2150-getsshpubkeysfromserver} (82%) rename config/includes.chroot/lib/live/config/{2200-x11-getxorgconf => 2200-xserver-xorg-getxorgconf} (94%) rename config/includes.chroot/lib/live/config/{2300-autoupdate => 2300-live-autoupdate} (75%) create mode 100755 config/includes.chroot/lib/live/config/2400-x2go-getportableappsessions create mode 100755 config/includes.chroot/lib/live/config/2410-x2go-getopensshportableclientkey create mode 100755 config/includes.chroot/lib/live/config/2500-tcpprint create mode 100644 config/package-lists/ntfs.list.chroot -- 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 5dfd7be69c2596d35c1d319b9f38c2c0764bf8de Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Dec 27 18:15:38 2016 +0100 added tcp printing feature --- .../includes.chroot/lib/live/config/2500-tcpprint | 76 ++++++++++++++++++++ config/package-lists/utils.list.chroot | 2 +- 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2500-tcpprint b/config/includes.chroot/lib/live/config/2500-tcpprint new file mode 100755 index 0000000..ded7412 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2500-tcpprint @@ -0,0 +1,76 @@ +#!/bin/bash + +TcpPrint () +{ + +# Output startup message +# +echo -n " tcpprint" + +if grep -q " *tcpprint *" /proc/cmdline ; then + TCPPRINTONLYFROM=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^tcpprintonlyfrom=/ { print $2 }') + if [ -n "$TCPPRINTONLYFROM" ] ; then + TCPPRINTONLYFROM="only_from = $TCPPRINTONLYFROM" + fi + # Backgrounding + ( + + while ! lsmod | grep -q "^lp"; do + # Wait till modprobe lp has occurred + # -> this means /dev is fully populated + # => USB-Printers can be detected now, too + sleep 30 + done + + PRINTERDEVICES="" + [ -d /dev/usb ] && PRINTERDEVICES=$(find /dev/usb -type c -name "lp*" | sort) + PRINTERDEVICES="$PRINTERDEVICES $(find /dev/ -maxdepth 1 -type c -name "lp*" | sort)" + + echo "\nSetting up local printers ..." >>/dev/tty9 + + # Create a listening port for a TCP/9100-RAW-printer + # + # printers may be at /dev/lp_ and at /dev/usb/lp_ + PRINTERCOUNT=0 + for PRINTERDEV in $PRINTERDEVICES; do + PORTNUMBER=$((PRINTERCOUNT+9100)) + echo "jetdirect${PRINTERCOUNT} ${PORTNUMBER}/tcp" >>/etc/services + cat >/etc/xinetd.d/jetdirect${PRINTERCOUNT} << JETDIRCONF +service jetdirect${PRINTERCOUNT} +{ + socket_type = stream + protocol = tcp + wait = no + user = root + server = /bin/dd + server_args = of=$PRINTERDEV bs=1024k + groups = yes + disable = no + instances = 1 + $TCPPRINTONLYFROM +} +JETDIRCONF + echo "Mapping $PRINTERDEV => $PORTNUMBER" >>/dev/tty9 + PRINTERCOUNT=$((PRINTERCOUNT+1)) + done + + echo "#Local printer config: Done." >/etc/xinetd.d/jetdirect + + if ps -C xinetd --no-header >/dev/null ; then + echo -n "xinetd needs to be restarted, trying to do that ..." >>/dev/tty9 + if /etc/init.d/xinetd restart; then + echo -n " success. All done." >>/dev/tty9 + else + echo -n " error." >>/dev/tty9 + fi + else + echo -n "No xinetd restart necessary. All done." >>/dev/tty9 + fi + + ) & +fi +} + +TcpPrint diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index 6214968..f5ca145 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -acpid acpi-support atftp kbd psmisc rsync screen vim x11vnc x11vnc-data +acpid acpi-support atftp kbd psmisc rsync screen vim x11vnc x11vnc-data xinetd -- 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 bd09ef7b0d9ac204b242b09b719543979ff1dfee Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Dec 23 15:56:19 2016 +0100 added a few packages as required, to see if we can build with "apt-recommends false" --- config/package-lists/live.list.chroot | 5 +++++ config/package-lists/utils.list.chroot | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 07dbea2..8a7d4f4 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,5 +1,10 @@ live-boot live-config live-config-sysvinit +live-tools +locales sysvinit-core sysv-rc +xserver-xorg-input-wacom +xserver-xorg-video-geode +xserver-xorg-video-qxl diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index 3772d98..6214968 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1 @@ -acpid acpi-support atftp psmisc vim screen kbd x11vnc x11vnc-data +acpid acpi-support atftp kbd psmisc rsync screen vim x11vnc x11vnc-data -- 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 6bc93234d722f3538d8a99749b8d2888ba7d106c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:21:56 2016 +0100 switched to one package name per line --- config/package-lists/utils.list.chroot | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index f5ca145..d5f395b 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1 +1,11 @@ -acpid acpi-support atftp kbd psmisc rsync screen vim x11vnc x11vnc-data xinetd +acpid +acpi-support +atftp +kbd +psmisc +rsync +screen +vim +x11vnc +x11vnc-data +xinetd -- 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 61bf0a1a1cd880a5abbbeccd49675568beec90df Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Dec 27 18:28:23 2016 +0100 added patch to share ssh secret keys between X2GoClient for Windows in portable mode and X2Go-TCE isohybrid residing on same USB media --- .../lib/live/config/2410-getopensshkey | 42 ++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2410-getopensshkey b/config/includes.chroot/lib/live/config/2410-getopensshkey new file mode 100755 index 0000000..c6b3859 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2410-getopensshkey @@ -0,0 +1,42 @@ +#!/bin/sh + + +X2GoGetOpenSSHKey () +{ +# Output startup message +# +echo -n " x2go-getopensshkey" + +# This script is for using the iso-hybrid image along with the "second partition" patch +# it allows you to share ssh secret keys between X2GoClient for Windows in portable +# mode and the X2Go-ThinClientEnvironment on the same USB media using different partitions + +# Homedir des clientseitigen X2Go-ThinClient-Accounts +# +X2GOHOME="/var/lib/x2gothinclient/" + +# Homedir der Portable-App-Installation +# +HOME="/media/PORTABLEAPP/" + +# .ssh-Directory anlegen, das existiert zu diesem Zeitpunkt noch nicht +# +mkdir -p $(readlink -m "$X2GOHOME/.ssh/") + +for KEYFILE in $HOME/ssh/* ; do + [ -s "$KEYFILE" ] || continue + KEYDESTPATH="$X2GOHOME/.ssh/$(basename "$KEYFILE")" + touch "$KEYDESTPATH" + chown x2gothinclient:x2gothinclient \ + $KEYDESTPATH + chmod 600 $KEYDESTPATH + cat $(readlink -m "$KEYFILE")>$KEYDESTPATH + +done + +ln -s $X2GOHOME/.ssh $X2GOHOME/ssh + +} + +X2GoGetOpenSSHKey + -- 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 b12987b80fe25106a7a6d38712c2b018ece39539 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Dec 27 18:24:59 2016 +0100 added patch to share session config between X2GoClient for Windows in portable mode and X2Go-TCE isohybrid residing on same USB media --- .../lib/live/config/2400-getportableappsettings | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2400-getportableappsettings b/config/includes.chroot/lib/live/config/2400-getportableappsettings new file mode 100755 index 0000000..b607643 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2400-getportableappsettings @@ -0,0 +1,23 @@ +#!/bin/sh + +GetPortableAppSettings () +{ + +# Output startup message +# +echo -n " getportableappsettings" + +# This script is for using the iso-hybrid image along with the "second partition" patch +# it allows you to share a configuration between X2GoClient for Windows in portable +# mode and the X2Go-ThinClientEnvironment on the same USB media using different partitions + +if [ -L /dev/disk/by-label/PORTABLEAPP ]; then + mkdir -p /media/PORTABLEAPP && \ + mount -o sync /dev/disk/by-label/PORTABLEAPP /media/PORTABLEAPP && \ + ln -sf /media/PORTABLEAPP/x2goclient/sessions /etc/x2go/x2gothinclient_sessions +else + true +fi +} + +GetPortableAppSettings -- 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 25d3af2c85a9fb96d3383e5b3a6b832b7e601b1f Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:22:25 2016 +0100 switched to one package name per line --- config/package-lists/x2go.list.chroot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 76c3903..2248182 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1 +1,2 @@ -x2goclient pulseaudio +x2goclient +pulseaudio -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit 99c49e5f57fe4ef1b4e5b124a5077e204eed8f09 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 01:33:50 2016 +0100 trying to get live-tools included into the final image --- config/package-lists/live.list.chroot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 8a7d4f4..2c8ab08 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,3 +1,4 @@ +initramfs-tools live-boot live-config live-config-sysvinit @@ -8,3 +9,4 @@ sysv-rc xserver-xorg-input-wacom xserver-xorg-video-geode xserver-xorg-video-qxl + -- 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 cdcc3200ab844971e332298ec0b9b9c9463f395c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:23:13 2016 +0100 switched to one package name per line --- config/package-lists/desktop.list.chroot | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index fdc5c81..17817b2 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1 +1,5 @@ -xserver-xorg-video-all xserver-xorg nodm openbox 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 41b1b09e3631c1ef90734932a90db77373095c15 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:23:45 2016 +0100 switched to one package name per line --- config/package-lists/firmware.list.chroot | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/package-lists/firmware.list.chroot b/config/package-lists/firmware.list.chroot index 7a63759..603f805 100644 --- a/config/package-lists/firmware.list.chroot +++ b/config/package-lists/firmware.list.chroot @@ -1 +1,7 @@ -firmware-linux-free firmware-linux-nonfree firmware-linux firmware-realtek firmware-ralink firmware-atheros firmware-iwlwifi +firmware-linux-free +firmware-linux-nonfree +firmware-linux +firmware-realtek +firmware-ralink +firmware-atheros +firmware-iwlwifi -- 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 1fe27751e1ada9699aef1b606f1359448fafff8d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:25:34 2016 +0100 moved x-related packages to desktop.list.chroot --- config/package-lists/desktop.list.chroot | 5 +++++ config/package-lists/live.list.chroot | 4 ---- config/package-lists/utils.list.chroot | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/config/package-lists/desktop.list.chroot b/config/package-lists/desktop.list.chroot index 17817b2..bc2d8fc 100644 --- a/config/package-lists/desktop.list.chroot +++ b/config/package-lists/desktop.list.chroot @@ -1,4 +1,9 @@ +x11vnc +x11vnc-data +xserver-xorg-input-wacom xserver-xorg-video-all +xserver-xorg-video-geode +xserver-xorg-video-qxl xserver-xorg nodm openbox diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 2c8ab08..b46ba88 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -6,7 +6,3 @@ live-tools locales sysvinit-core sysv-rc -xserver-xorg-input-wacom -xserver-xorg-video-geode -xserver-xorg-video-qxl - diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index d5f395b..8d7606d 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -6,6 +6,4 @@ psmisc rsync screen vim -x11vnc -x11vnc-data xinetd -- 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 54a63ccb456663c1e3bc7847c347b1259b5facae Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:34:35 2016 +0100 added more packages to make system useable when useing apt-recommmends false --- config/package-lists/live.list.chroot | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index b46ba88..607a45b 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,8 +1,16 @@ +console-setup +console-setup-linux initramfs-tools +kbd +keyboard-configuration live-boot live-config live-config-sysvinit live-tools locales +login +mount +passwd sysvinit-core sysv-rc +user-setup -- 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 a6e2ab5e9982794f0d6a2ad059bdae6f065421ee Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:41:35 2016 +0100 added packages for rdp support and additional packages for pulseaudio when using apt-recommends false --- config/package-lists/x2go.list.chroot | 46 +++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 2248182..02aa3f3 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,2 +1,48 @@ +freerdp-x11 +libfreerdp-cache1.1 +libfreerdp-client1.1 +libfreerdp-codec1.1 +libfreerdp-common1.1.0 +libfreerdp-core1.1 +libfreerdp-crypto1.1 +libfreerdp-gdi1.1 +libfreerdp-locale1.1 +libfreerdp-primitives1.1 +libfreerdp-rail1.1 +libfreerdp-utils1.1 +libjpeg62-turbo +libssl1.0.0 +libwinpr-crt0.1 +libwinpr-crypto0.1 +libwinpr-dsparse0.1 +libwinpr-environment0.1 +libwinpr-file0.1 +libwinpr-handle0.1 +libwinpr-heap0.1 +libwinpr-input0.1 +libwinpr-interlocked0.1 +libwinpr-library0.1 +libwinpr-path0.1 +libwinpr-pool0.1 +libwinpr-registry0.1 +libwinpr-rpc0.1 +libwinpr-sspi0.1 +libwinpr-synch0.1 +libwinpr-sysinfo0.1 +libwinpr-thread0.1 +libwinpr-utils0.1 +libx11-6 +libxcursor1 +libxext6 +libxfreerdp-client1.1 +libxi6 +libxinerama1 +libxkbfile1 +libxrender1 +libxv1 x2goclient pulseaudio +pulseaudio-module-x11 +pulseaudio-utils +rdesktop +zlib1g -- 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 976c51a626e9c510ddbf373f8f2d21a59a315b4c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 13:35:36 2016 +0100 added ssh and wget packages so image works even with apt-recommends false --- config/package-lists/utils.list.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index 8d7606d..bde5123 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -2,8 +2,13 @@ acpid acpi-support atftp kbd +openssh-client +openssh-server +openssh-sftp-server +openssl psmisc rsync screen vim +wget xinetd -- 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 c65cb02f9aec83daac5b6f557f99d83302c43d5f Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 01:03:22 2017 +0100 fixed whitespace detection around cmdline parameters --- .../includes.chroot/lib/live/config/2500-tcpprint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2500-tcpprint b/config/includes.chroot/lib/live/config/2500-tcpprint index ded7412..225a6ec 100755 --- a/config/includes.chroot/lib/live/config/2500-tcpprint +++ b/config/includes.chroot/lib/live/config/2500-tcpprint @@ -7,7 +7,7 @@ TcpPrint () # echo -n " tcpprint" -if grep -q " *tcpprint *" /proc/cmdline ; then +if grep -q "\W*tcpprint\W*" /proc/cmdline ; then TCPPRINTONLYFROM=$(cat /proc/cmdline | \ tr ' ' '\n' | \ awk -F'=' ' /^tcpprintonlyfrom=/ { 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/openbox in repository live-build-x2go. commit 6075c4eee2a48de723946d22b131e58b1cccdd87 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 16:46:19 2016 +0100 add ntfs read-write support --- config/package-lists/ntfs.list.chroot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/package-lists/ntfs.list.chroot b/config/package-lists/ntfs.list.chroot new file mode 100644 index 0000000..e3e6fd6 --- /dev/null +++ b/config/package-lists/ntfs.list.chroot @@ -0,0 +1,6 @@ +fuse +libfuse2 +libgcrypt20 +libgnutls-deb0-28 +libgpg-error0 +ntfs-3g -- 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 295ba4fa0ed16fbd13eee15f964469c0da59aad7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 14:33:10 2016 +0100 sudo was still missing when using apt-recommends false --- config/package-lists/live.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 607a45b..4993b11 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -11,6 +11,7 @@ locales login mount passwd +sudo sysvinit-core sysv-rc user-setup -- 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 84bb7158491ba6920ccbbe7a6c7067c9bb0d47f4 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 20:21:23 2016 +0100 fixed whitespace detection around cmdline parameters --- .../includes.chroot/lib/live/config/2100-lockuser | 2 +- .../lib/live/config/2800-x2go-thinclientconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2100-lockuser b/config/includes.chroot/lib/live/config/2100-lockuser index 7f89531..1cbcc15 100755 --- a/config/includes.chroot/lib/live/config/2100-lockuser +++ b/config/includes.chroot/lib/live/config/2100-lockuser @@ -10,7 +10,7 @@ echo -n " lockuser" # Set password # -if grep -q " *nouser *" /proc/cmdline ; then +if grep -q "\W*nouser\W*" /proc/cmdline ; then passwd -l user >/dev/null fi diff --git a/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2800-x2go-thinclientconfig 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/openbox in repository live-build-x2go. commit 8bc2277c6cacbd600aeffcc137cd4effb97f7298 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 21:28:49 2016 +0100 typofixes --- .../lib/live/config/2300-autoupdate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-autoupdate b/config/includes.chroot/lib/live/config/2300-autoupdate index 324f62a..ebc2bb5 100755 --- a/config/includes.chroot/lib/live/config/2300-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-autoupdate @@ -57,7 +57,7 @@ DOWNLOADURL=$(cat /proc/cmdline | \ tr ' ' '\n' | \ awk -F'=' ' /^updateurl=/ { print $2 }') -if [ -z "$\DOWNLOADURL" ]; then +if [ -z "$DOWNLOADURL" ]; then echo "No update URL. Exiting." return 0 fi @@ -68,7 +68,7 @@ fi BWLIMITPERCENT=$(cat /proc/cmdline | \ tr ' ' '\n' | \ awk -F'=' ' /^bwlimit=/ { print $2 }') -if [ -z "$\BWLIMITPERCENT" ]; then +if [ -z "$BWLIMITPERCENT" ]; then BWLIMITPERCENT=20 echo "Bandwidth limit not set. Defaulting to 20%." 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/openbox in repository live-build-x2go. commit 707dbd114798241217dcce486d28edd79c1e12fb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 22:53:29 2016 +0100 make autoupdater wait until tty10 becomes available --- .../lib/live/config/2300-autoupdate | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2300-autoupdate b/config/includes.chroot/lib/live/config/2300-autoupdate index ebc2bb5..8989bad 100755 --- a/config/includes.chroot/lib/live/config/2300-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-autoupdate @@ -34,6 +34,10 @@ echo -n " autoupdater (backgrounding update task)" # ( +# wait until terminal is available +while ! [ -c /dev/tty10 ] ; do + sleep 10 +done # redirect all output to console #10 # -- 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 c769c425b38b23f75e5aaaef24fd9e15959c6d93 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Dec 31 19:27:33 2016 +0100 added option to disable screen blanking --- .../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/openbox in repository live-build-x2go. commit f07bcf468ae61385398d9ce109bb21bdd4e99cf3 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/openbox in repository live-build-x2go. commit c61268e780b708fcb3dbfa150ab8042d74d2f74b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 01:44:43 2017 +0100 changed path-/filenames etc. to X2Go/x2go-tce prefix --- .../lib/live/config/2300-autoupdate | 42 +++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-autoupdate b/config/includes.chroot/lib/live/config/2300-autoupdate index 8989bad..3f3b9ac 100755 --- a/config/includes.chroot/lib/live/config/2300-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-autoupdate @@ -112,10 +112,10 @@ else mount -t tmpfs -osize=$((IMGSIZE*15/10))k tmpfs $TEMPDIR fi -if ! ( [ -d "$MOUNTPOINT/boot/live-download" ] && \ +if ! ( [ -d "$MOUNTPOINT/boot/X2Go-live-download" ] && \ ( \ - [ -d "$MOUNTPOINT/boot/live1" ] || \ - [ -d "$MOUNTPOINT/boot/live2" ] \ + [ -d "$MOUNTPOINT/boot/X2Go-live1" ] || \ + [ -d "$MOUNTPOINT/boot/X2Go-live2" ] \ ) \ ); then [ -n "$NTFSROOT" ] && umount $MOUNTPOINT @@ -148,20 +148,20 @@ RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(cat /proc/cmdline | ALLSYSTEMSROOT=$(dirname $RUNNINGSYSTEMFULLPATH) RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH) -if [ "$RUNNINGSYSTEMNAME" = "live1" ]; then - OTHERSYSTEMNAME="live2" -elif [ "$RUNNINGSYSTEMNAME" = "live2" ]; then - OTHERSYSTEMNAME="live1" +if [ "$RUNNINGSYSTEMNAME" = "X2Go-live1" ]; then + OTHERSYSTEMNAME="X2Go-live2" +elif [ "$RUNNINGSYSTEMNAME" = "X2Go-live2" ]; then + OTHERSYSTEMNAME="X2Go-live1" else [ -n "$NTFSROOT" ] && umount $MOUNTPOINT echo "Unable to determine path/name of running system." return 1 fi OTHERSYSTEMFULLPATH=$(readlink -m "$ALLSYSTEMSROOT/$OTHERSYSTEMNAME") -DOWNLOADPATH=$(readlink -m "$ALLSYSTEMSROOT/live-download/") +DOWNLOADPATH=$(readlink -m "$ALLSYSTEMSROOT/X2Go-live-download/") -# Now we'll copy the content of the live-download folder to our tempdir +# Now we'll copy the content of the X2Go-live-download folder to our tempdir # this is so we can run wget in update mode (-N) or rsync without needing # write access to our boot medium (write access means increased wear and tear, # and we want to avoid that especially for media that has no wear-leveling @@ -181,9 +181,9 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ then # Attempt to determine available bandwidth & to set BWLIMIT accordingly wget -Nr -o /tmp/dl.log -P /tmp/ -nd \ - --progress=bar:force $DOWNLOADURL/initrd.img - cp --update "/tmp/initrd.img" "$TEMPDIR" - rm "/tmp/initrd.img" + --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img + cp --update "/tmp/x2gp-tce-initrd.img" "$TEMPDIR" + rm "/tmp/x2go-tce-initrd.img" SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \ $7 == "-" { print $5 }' /tmp/dl.log \ ) @@ -212,9 +212,9 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ elif echo "$DOWNLOADURL" | grep -q "^rsync"; then - rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/initrd.img \ - $TEMPDIR/initrd.img.new - mv $TEMPDIR/initrd.img.new $TEMPDIR/initrd.img + rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/x2go-tce-initrd.img \ + $TEMPDIR/x2go-tce-initrd.img.new + mv $TEMPDIR/x2go-tce-initrd.img.new $TEMPDIR/x2go-tce-initrd.img SIZEFACTORSTRING=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \ awk '$4 == "sent" && $12 == "bytes/sec" \ { print $11 }' \ @@ -346,16 +346,20 @@ fi # change default boot to the image we just downloaded and installed # if [ -n "$SYSLINUXPATH" ]; then - echo "Changing syslinux default to $OTHERSYSTEMNAME-486." - sed -i -e"/^default/cdefault $OTHERSYSTEMNAME-486" \ + echo "Changing syslinux default to $OTHERSYSTEMNAME." + sed -i -e"/^default/cdefault $OTHERSYSTEMNAME" \ $SYSLINUXPATH/syslinux.cfg elif [ -n "$GRUBPATH" ]; then MENULST=$GRUBPATH/menu.lst CURRENTDEFAULT=$(awk '/^default/ { print $2 }' $MENULST | tr -d '\r') - CURRENTTITLEPOSITION=$(grep '^title' $MENULST | grep -n "${RUNNINGSYSTEMNAME}-486" | awk -F':' '$2 ~ /'"${RUNNINGSYSTEMNAME}-486"'/ { print $1 }') + CURRENTTITLEPOSITION=$(grep '^title' $MENULST | + grep -n "${RUNNINGSYSTEMNAME}" | + awk -F':' '$2 ~ /'"${RUNNINGSYSTEMNAME}"'/ { print $1 }') CURRENTTITLEPOSITION=$((CURRENTTITLEPOSITION-1)) - OTHERTITLEPOSITION=$(grep '^title' $MENULST | grep -n "${OTHERSYSTEMNAME}-486" | awk -F':' '$2 ~ /'"${OTHERSYSTEMNAME}-486"'/ { print $1 }') + OTHERTITLEPOSITION=$(grep '^title' $MENULST | + grep -n "${OTHERSYSTEMNAME}" | + awk -F':' '$2 ~ /'"${OTHERSYSTEMNAME}"'/ { print $1 }') OTHERTITLEPOSITION=$((OTHERTITLEPOSITION-1)) if [ "$CURRENTTITLEPOSITION" = "$CURRENTDEFAULT" ]; then echo "Changing GRUB-legacy default to $OTHERTITLEPOSITION ..." -- 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 87c093adc1f767716536126c6fddbb492ec4d46e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 21:58:46 2017 +0100 typofix, forgot escapes --- .../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/openbox in repository live-build-x2go. commit 27cf27fe21c9909b0e97946f33d22cda6eb141ce Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 1 23:48:40 2017 +0100 fix dpms call --- .../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/openbox in repository live-build-x2go. commit 6871d5017941cdb7d4f7787d85c5c455de5b1dac 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/openbox in repository live-build-x2go. commit 236d8444ef0670a2d331c14f508e9304e0be6b42 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 09:32:13 2017 +0100 name change --- .../lib/live/config/2300-autoupdate | 412 -------------------- 1 file changed, 412 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-autoupdate b/config/includes.chroot/lib/live/config/2300-autoupdate deleted file mode 100755 index 38a579b..0000000 --- a/config/includes.chroot/lib/live/config/2300-autoupdate +++ /dev/null @@ -1,412 +0,0 @@ -#!/bin/sh - -cleanup () -{ # discard contents of tmpfs, umount if necessary - if [ -n "$NTFSROOT" ]; then - echo "Removing '$TEMPDIR/*'." - rm -rf $TEMPDIR/* - else - echo "Unmounting '$TEMPDIR'." - umount $TEMPDIR - fi - if rmdir $TEMPDIR; then - echo "Removed empty directory '$TEMPDIR'." - else - echo "Could not remove directory '$TEMPDIR'." - fi - if [ -n "$NTFSROOT" ]; then - if umount $MOUNTPOINT; then - echo "Unmounted '$MOUNTPOINT'." - else - echo "Could not unmount '$MOUNTPOINT'." - fi - fi -} - -AutoUpdateMain () -{ -# Output startup message -# -echo -n " autoupdater (backgrounding update task)" - - -# Background everything -# -( - -# wait until terminal is available -while ! [ -c /dev/tty10 ] ; do - sleep 10 -done - -# redirect all output to console #10 -# -exec >/dev/tty10 2>&1 - - -# clear console -# -clear - - -# This is so grep, awk and sed will match the right terms regardless of LANG -# -unset LANG -unset LC_ALL -unset LC_MESSAGES - - -# download url pointing to directory with all required files goes here -DOWNLOADURL=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^updateurl=/ { print $2 }') - -if [ -z "$DOWNLOADURL" ]; then - echo "No update URL. Exiting." - return 0 -fi - -# Bandwidth limit goes here -# -#BWLIMITPERCENT=20 # in percent, numeric-only -BWLIMITPERCENT=$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^bwlimit=/ { print $2 }') -if [ -z "$BWLIMITPERCENT" ]; then - BWLIMITPERCENT=20 - echo "Bandwidth limit not set. Defaulting to 20%." -fi - - - -# sleeping a random amount of time to ease load on the update server -# -SLEEPTIME=0 -echo -n "Calculating random update delay (120-900 seconds)..." -while [ $SLEEPTIME -lt 120 ]; do - echo -n "." - # During startup, script is run with /bin/sh, - # even when #!/bin/bash is set, - # so we need to improvise. - RND=$(/bin/bash -c 'echo $RANDOM') - SLEEPTIME=$((RND%900)) -done -echo " " -echo "Sleeping for $SLEEPTIME seconds ..." -sleep $SLEEPTIME - - -# Define our mountpoint and check if we're capable of auto-updating -NTFSROOT=$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '/^ntfs-uuid/ { print $2 }') -if [ -n "$NTFSROOT" ]; then - mkdir -p /lib/live/mount/ntfsroot - # This is in case we've been passed an incomplete UUID and/or one with dashes - # For example, "vol c:" on Windows will return the last 8 digits of the UUID - # only, and separate them with a dash. - if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then - NTFSROOT=$(echo $NTFSROOT | tr -d '-') - if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then - NTFSROOT=$(echo /dev/disk/by-uuid/*$NTFSROOT | tr ' ' '\n' | head -1) - fi - fi - - mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot - MOUNTPOINT="/lib/live/mount/ntfsroot/" - # create a temporary directory - TEMPDIR=$(mktemp -d --tmpdir=$MOUNTPOINT) -else - MOUNTPOINT="/lib/live/mount/findiso/" - # create a temporary directory and mount a tmpfs there - TEMPDIR=$(mktemp -d --tmpdir=/mnt) - IMGSIZE=$(df /lib/live/mount/medium | awk ' /medium/ { print $2}') - mount -t tmpfs -osize=$((IMGSIZE*15/10))k tmpfs $TEMPDIR - -fi -if ! ( [ -d "$MOUNTPOINT/boot/X2Go-live-download" ] && \ - ( \ - [ -d "$MOUNTPOINT/boot/X2Go-live1" ] || \ - [ -d "$MOUNTPOINT/boot/X2Go-live2" ] \ - ) \ - ); then - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "No directories suitable for update." - return 0 # directories missing, most likely not a writeable medium -fi - - -# define and figure out some paths that we will be needing later on -# -if [ -f "$MOUNTPOINT/syslinux.cfg" ]; then - SYSLINUXPATH="$MOUNTPOINT/" -elif [ -f "$MOUNTPOINT/syslinux/syslinux.cfg" ]; then - SYSLINUXPATH="$MOUNTPOINT/syslinux/" -elif [ -f "$MOUNTPOINT/menu.lst" ]; then - GRUBPATH="$MOUNTPOINT/" -elif [ -f "$MOUNTPOINT/boot/menu.lst" ]; then - GRUBPATH="$MOUNTPOINT/grub/" -elif [ -f "$MOUNTPOINT/boot/grub/menu.lst" ]; then - GRUBPATH="$MOUNTPOINT/boot/grub/" -else - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "No suitable bootloader found." - return 1 -fi - -RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(cat /proc/cmdline | \ - tr ' ' '\n' | \ - awk -F'=' ' /^findiso=/ { print $2 }')")) - -ALLSYSTEMSROOT=$(dirname $RUNNINGSYSTEMFULLPATH) -RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH) -if [ "$RUNNINGSYSTEMNAME" = "X2Go-live1" ]; then - OTHERSYSTEMNAME="X2Go-live2" -elif [ "$RUNNINGSYSTEMNAME" = "X2Go-live2" ]; then - OTHERSYSTEMNAME="X2Go-live1" -else - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "Unable to determine path/name of running system." - return 1 -fi -OTHERSYSTEMFULLPATH=$(readlink -m "$ALLSYSTEMSROOT/$OTHERSYSTEMNAME") -DOWNLOADPATH=$(readlink -m "$ALLSYSTEMSROOT/X2Go-live-download/") - - -# Now we'll copy the content of the X2Go-live-download folder to our tempdir -# this is so we can run wget in update mode (-N) or rsync without needing -# write access to our boot medium (write access means increased wear and tear, -# and we want to avoid that especially for media that has no wear-leveling -# like CF cards) -# -while ! rsync -aPv --inplace --modify-window=1 $DOWNLOADPATH/ $TEMPDIR; do - echo "Sleeping 30 seconds ..." - sleep 30 - echo "Retrying ..." -done - - -# Now let's figure out if we're supposed to use wget or rsync for downloading -# -if echo "$DOWNLOADURL" | grep -q "^http" || \ - echo "$DOWNLOADURL" | grep -q "^ftp" - then - # Attempt to determine available bandwidth & to set BWLIMIT accordingly - wget -Nr -o /tmp/dl.log -P /tmp/ -nd \ - --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img - cp --update "/tmp/x2gp-tce-initrd.img" "$TEMPDIR" - rm "/tmp/x2go-tce-initrd.img" - SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \ - $7 == "-" { print $5 }' /tmp/dl.log \ - ) - case $SIZEFACTORSTRING in - "" | \ - [0-9]) echo -n "Not enough Bandwidth for update task - " - echo -n "aborting." - cleanup - return 0 - ;; - "KB/s") SIZEFACTOR=1;; - "MB/s") SIZEFACTOR=1024;; - "GB/s") SIZEFACTOR=1048576;; - *) SIZEFACTOR=$((1024*1024*1024));; - esac - DLRATE=$( awk -F' |\(|\)' ' $9 == "saved" && $7 == "-" \ - { print $4 }' /tmp/dl.log \ - ) - BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \ - awk ' { print $1*$2*$3/100 }' | \ - awk -F'.' '{ print $1 }' \ - ) # outputs integer kilobytes, not rounded - echo "Determined bandwidth limit: '$BWLIMIT KB/s'" - DOWNLOADCOMMAND="wget -Nr -l 1 -nd -P "$TEMPDIR" \ - --limit-rate=${BWLIMIT}k $DOWNLOADURL" - -elif echo "$DOWNLOADURL" | grep -q "^rsync"; then - - rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/x2go-tce-initrd.img \ - $TEMPDIR/x2go-tce-initrd.img.new - mv $TEMPDIR/x2go-tce-initrd.img.new $TEMPDIR/x2go-tce-initrd.img - SIZEFACTORSTRING=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \ - awk '$4 == "sent" && $12 == "bytes/sec" \ - { print $11 }' \ - ) - case $SIZEFACTORSTRING in - "" | \ - [0-9]) echo -n "Not enough Bandwidth for update task - " - echo -n "aborting." - cleanup - return 0 - ;; - "K") SIZEFACTOR=1;; - "M") SIZEFACTOR=1024;; - "G") SIZEFACTOR=$((1024*1024));; - *) SIZEFACTOR=$((1024*1024*1024));; - esac - DLRATE=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \ - awk '$4 == "sent" && $12 == "bytes/sec" \ - { print $10 }') - BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \ - awk ' { print $1*$2*$3/100 }' | \ - awk -F'.' '{ print $1 }' \ - ) # outputs integer kilobytes, not rounded - echo "Determined bandwidth limit: '$BWLIMIT KB/s'" - DOWNLOADCOMMAND="rsync -aPv --inplace --bwlimit=$BWLIMIT $DOWNLOADURL/ \ - $TEMPDIR" -else - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "Unsupported download mechanism." - return 1 -fi -rm /tmp/dl.log - - -# Proceed to download from update location -# -while ! $DOWNLOADCOMMAND; do - echo "Sleeping 30 seconds ..." - sleep 30 - echo "Retrying ..." -done - -# Now check if these files are different from what we already have in our -# download directory on the boot medium -# -echo "Diff'ing '$DOWNLOADPATH' '$TEMPDIR' ..." -if diff -q $DOWNLOADPATH $TEMPDIR \ - >/dev/null - - then - cleanup - echo "Nothing to do. - Files on server not newer than '$DOWNLOADPATH'." - return 0 # current is newest, nothing to do, we want to avoid - # unneccessary writes to the medium -else - echo "Differences detected. Continuing ..." -fi - - -# If we made it past that point, it's time to update the boot medium, so let's -# remount it rw and async for speed -# -if mount -oremount,rw,async $MOUNTPOINT; then - echo "Remounted '$MOUNTPOINT' as rw and async." -else - echo "Could not remount '$MOUNTPOINT' as rw and async." -fi - - -# Now, we don't want to copy an index.htm(l) file, so let's do away with that -# -rm -f $TEMPDIR/index.ht* - - -# move everything over to the boot medium -# -echo "Moving $TEMPDIR/* => $DOWNLOADPATH" -mv $TEMPDIR/* $DOWNLOADPATH -cleanup # FIXME ist dieses Cleanup gerechtfertigt oder macht es dummfoog? -if [ -n "$NTFSROOT" ]; then - echo "NTFSROOT detected. Attempting to mount '/dev/disk/by-uuid/$NTFSROOT'." - if mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot; then - echo "Mount successful." - else - echo "Failed to mount NTFSROOT." - fi -fi - - -# let's check if we just downloaded a copy of our running system -# -echo "Diff'ing '$DOWNLOADPATH' '$RUNNINGSYSTEMFULLPATH'" -if diff -q $DOWNLOADPATH $RUNNINGSYSTEMFULLPATH >/dev/null && \ - [ -d "$OTHERSYSTEMFULLPATH" ] ; then - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "Nothing to do. Content of $DOWNLOADPATH equals" \ - "$RUNNINGSYSTEMNAME." - return 0 # current is newest, nothing to do, - # we want to keep the old system in OTHERSYSTEMFULLPATH - # as a fallback -fi - - -# make sure our destination path really exists -# -mkdir -p $OTHERSYSTEMFULLPATH - - -# let's check if our destination is already up to date or needs updating -# -echo "Diff'ing '$DOWNLOADPATH' '$OTHERSYSTEMFULLPATH'" -if diff -q $DOWNLOADPATH $OTHERSYSTEMFULLPATH >/dev/null; then - [ -n "$NTFSROOT" ] && umount $MOUNTPOINT - echo "Nothing to do - content of '$DOWNLOADPATH' equals"\ - "'$OTHERSYSTEMNAME'." - return 0 # OTHERSYSTEMFULLPATH is already up to date -else - # keep rsyncing until the update is complete - echo "Copying $DOWNLOADPATH/ => $OTHERSYSTEMFULLPATH" - while ! rsync -aPv --inplace --modify-window=1 $DOWNLOADPATH/ $OTHERSYSTEMFULLPATH - do - echo "Sleeping 30 seconds ..." - sleep 30 - echo "Retrying ..." - done -fi - - -# change default boot to the image we just downloaded and installed -# -if [ -n "$SYSLINUXPATH" ]; then - echo "Changing syslinux default to $OTHERSYSTEMNAME." - sed -i -e"/^default/cdefault $OTHERSYSTEMNAME" \ - $SYSLINUXPATH/syslinux.cfg - -elif [ -n "$GRUBPATH" ]; then - MENULST=$GRUBPATH/menu.lst - CURRENTDEFAULT=$(awk '/^default/ { print $2 }' $MENULST | tr -d '\r') - CURRENTTITLEPOSITION=$(grep '^title' $MENULST | - grep -n "${RUNNINGSYSTEMNAME}" | - awk -F':' '$2 ~ /'"${RUNNINGSYSTEMNAME}"'/ { print $1 }') - CURRENTTITLEPOSITION=$((CURRENTTITLEPOSITION-1)) - OTHERTITLEPOSITION=$(grep '^title' $MENULST | - grep -n "${OTHERSYSTEMNAME}" | - awk -F':' '$2 ~ /'"${OTHERSYSTEMNAME}"'/ { print $1 }') - OTHERTITLEPOSITION=$((OTHERTITLEPOSITION-1)) - if [ "$CURRENTTITLEPOSITION" = "$CURRENTDEFAULT" ]; then - echo "Changing GRUB-legacy default to $OTHERTITLEPOSITION ..." - sed -i -e"/^default/cdefault $OTHERTITLEPOSITION" \ - $MENULST - else - echo "Not changing GRUB-legacy default." - echo "Reason: We're at boot position '$CURRENTTITLEPOSITION'," - echo "while default is set to position '$CURRENTDEFAULT'." - fi -else - echo "Unsupported bootloader." -fi - -# we're on an async mount point, so let's sync to be safe -# -sync - - -# umount tempdir to free memory -# -if [ -d $TEMPDIR ]; then - cleanup -fi - - -# now, change mount back to ro and sync -# -if [ -n "$NTFSROOT" ]; then - umount $MOUNTPOINT -else - mount -oremount,ro,sync $MOUNTPOINT -fi - -) & - -} - -AutoUpdateMain - -- 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 fe0d89d676eaaa593ded4547f6fbe13915af3388 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 02:30:50 2017 +0100 added support for incomplete and dash-separated ntfs uuids --- .../lib/live/config/2300-autoupdate | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2300-autoupdate b/config/includes.chroot/lib/live/config/2300-autoupdate index 3f3b9ac..38a579b 100755 --- a/config/includes.chroot/lib/live/config/2300-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-autoupdate @@ -100,6 +100,16 @@ sleep $SLEEPTIME NTFSROOT=$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '/^ntfs-uuid/ { print $2 }') if [ -n "$NTFSROOT" ]; then mkdir -p /lib/live/mount/ntfsroot + # This is in case we've been passed an incomplete UUID and/or one with dashes + # For example, "vol c:" on Windows will return the last 8 digits of the UUID + # only, and separate them with a dash. + if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then + NTFSROOT=$(echo $NTFSROOT | tr -d '-') + if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then + NTFSROOT=$(echo /dev/disk/by-uuid/*$NTFSROOT | tr ' ' '\n' | head -1) + fi + fi + mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot MOUNTPOINT="/lib/live/mount/ntfsroot/" # create a temporary directory -- 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 81c2ff546539dc3748e2f9d32c92e6cd2bb7094d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 09:36:51 2017 +0100 added some status messages and error checking --- .../lib/live/config/2300-live-autoupdate | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 520b1a3..62afd3c 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -110,7 +110,12 @@ if [ -n "$NTFSROOT" ]; then fi fi - mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot + if mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot ; then + echo "Mounted '/dev/disk/by-uuid/$NTFSROOT'." + else + echo "Unable to mount '/dev/disk/by-uuid/$NTFSROOT'." + fi + # TODO: Further error handling MOUNTPOINT="/lib/live/mount/ntfsroot/" # create a temporary directory TEMPDIR=$(mktemp -d --tmpdir=$MOUNTPOINT) @@ -399,9 +404,17 @@ fi # now, change mount back to ro and sync # if [ -n "$NTFSROOT" ]; then - umount $MOUNTPOINT + if umount $MOUNTPOINT; then + echo "Unmounted '$MOUNTPOINT'." + else + echo "Unable to unmount '$MOUNTPOINT'." + fi else - mount -oremount,ro,sync $MOUNTPOINT + if mount -oremount,ro,sync $MOUNTPOINT; then + echo "Remounted '$MOUNTPOINT' ro and sync." + else + echo "Unable to remount '$MOUNTPOINT' ro and sync." + 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/openbox in repository live-build-x2go. commit 5dfa60a2bcf661a80fd7353d8a44ece1b9753e2d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:04:24 2017 +0100 name change --- .../config/{2000-ipconfig => 2000-showifconfig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-ipconfig b/config/includes.chroot/lib/live/config/2000-showifconfig similarity index 100% rename from config/includes.chroot/lib/live/config/2000-ipconfig rename to config/includes.chroot/lib/live/config/2000-showifconfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit 7b2b24aeeb82b272bab831ef8bf5b1e192c76282 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:05:21 2017 +0100 name change --- .../lib/live/config/2000-showifconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-showifconfig b/config/includes.chroot/lib/live/config/2000-showifconfig index fb108ea..20896d4 100755 --- a/config/includes.chroot/lib/live/config/2000-showifconfig +++ b/config/includes.chroot/lib/live/config/2000-showifconfig @@ -1,11 +1,11 @@ #!/bin/bash -IFConfig () +ShowIFConfig () { # Output startup message # -echo -n " ifconfig" +echo -n " showifconfig" #setterm -term linux -r >/dev/tty9 # Make sure no language-specific stuff interferes with our matching @@ -36,4 +36,4 @@ chmod 755 /etc/network/if-up.d/showips } -IFConfig +ShowIFConfig -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox in repository live-build-x2go. commit b744314856d980a2509d70e178f7208edb3bf0fa Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:05:59 2017 +0100 name change --- ...1-getxorgconf => 2200-xserver-xorg-getxorgconf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2200-x11-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf similarity index 100% rename from config/includes.chroot/lib/live/config/2200-x11-getxorgconf rename to config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf -- 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 2f69cea91506075f791b5468a4090fee81dd5226 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 09:31:51 2017 +0100 name change --- .../lib/live/config/2300-live-autoupdate | 412 ++++++++++++++++++++ 1 file changed, 412 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate new file mode 100755 index 0000000..520b1a3 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -0,0 +1,412 @@ +#!/bin/sh + +cleanup () +{ # discard contents of tmpfs, umount if necessary + if [ -n "$NTFSROOT" ]; then + echo "Removing '$TEMPDIR/*'." + rm -rf $TEMPDIR/* + else + echo "Unmounting '$TEMPDIR'." + umount $TEMPDIR + fi + if rmdir $TEMPDIR; then + echo "Removed empty directory '$TEMPDIR'." + else + echo "Could not remove directory '$TEMPDIR'." + fi + if [ -n "$NTFSROOT" ]; then + if umount $MOUNTPOINT; then + echo "Unmounted '$MOUNTPOINT'." + else + echo "Could not unmount '$MOUNTPOINT'." + fi + fi +} + +LiveAutoUpdateMain () +{ +# Output startup message +# +echo -n " live-autoupdater (backgrounding update task)" + + +# Background everything +# +( + +# wait until terminal is available +while ! [ -c /dev/tty10 ] ; do + sleep 10 +done + +# redirect all output to console #10 +# +exec >/dev/tty10 2>&1 + + +# clear console +# +clear + + +# This is so grep, awk and sed will match the right terms regardless of LANG +# +unset LANG +unset LC_ALL +unset LC_MESSAGES + + +# download url pointing to directory with all required files goes here +DOWNLOADURL=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^updateurl=/ { print $2 }') + +if [ -z "$DOWNLOADURL" ]; then + echo "No update URL. Exiting." + return 0 +fi + +# Bandwidth limit goes here +# +#BWLIMITPERCENT=20 # in percent, numeric-only +BWLIMITPERCENT=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^bwlimit=/ { print $2 }') +if [ -z "$BWLIMITPERCENT" ]; then + BWLIMITPERCENT=20 + echo "Bandwidth limit not set. Defaulting to 20%." +fi + + + +# sleeping a random amount of time to ease load on the update server +# +SLEEPTIME=0 +echo -n "Calculating random update delay (120-900 seconds)..." +while [ $SLEEPTIME -lt 120 ]; do + echo -n "." + # During startup, script is run with /bin/sh, + # even when #!/bin/bash is set, + # so we need to improvise. + RND=$(/bin/bash -c 'echo $RANDOM') + SLEEPTIME=$((RND%900)) +done +echo " " +echo "Sleeping for $SLEEPTIME seconds ..." +sleep $SLEEPTIME + + +# Define our mountpoint and check if we're capable of auto-updating +NTFSROOT=$(cat /proc/cmdline | tr ' ' '\n' | awk -F '=' '/^ntfs-uuid/ { print $2 }') +if [ -n "$NTFSROOT" ]; then + mkdir -p /lib/live/mount/ntfsroot + # This is in case we've been passed an incomplete UUID and/or one with dashes + # For example, "vol c:" on Windows will return the last 8 digits of the UUID + # only, and separate them with a dash. + if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then + NTFSROOT=$(echo $NTFSROOT | tr -d '-') + if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then + NTFSROOT=$(echo /dev/disk/by-uuid/*$NTFSROOT | tr ' ' '\n' | head -1) + fi + fi + + mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot + MOUNTPOINT="/lib/live/mount/ntfsroot/" + # create a temporary directory + TEMPDIR=$(mktemp -d --tmpdir=$MOUNTPOINT) +else + MOUNTPOINT="/lib/live/mount/findiso/" + # create a temporary directory and mount a tmpfs there + TEMPDIR=$(mktemp -d --tmpdir=/mnt) + IMGSIZE=$(df /lib/live/mount/medium | awk ' /medium/ { print $2}') + mount -t tmpfs -osize=$((IMGSIZE*15/10))k tmpfs $TEMPDIR + +fi +if ! ( [ -d "$MOUNTPOINT/boot/X2Go-live-download" ] && \ + ( \ + [ -d "$MOUNTPOINT/boot/X2Go-live1" ] || \ + [ -d "$MOUNTPOINT/boot/X2Go-live2" ] \ + ) \ + ); then + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "No directories suitable for update." + return 0 # directories missing, most likely not a writeable medium +fi + + +# define and figure out some paths that we will be needing later on +# +if [ -f "$MOUNTPOINT/syslinux.cfg" ]; then + SYSLINUXPATH="$MOUNTPOINT/" +elif [ -f "$MOUNTPOINT/syslinux/syslinux.cfg" ]; then + SYSLINUXPATH="$MOUNTPOINT/syslinux/" +elif [ -f "$MOUNTPOINT/menu.lst" ]; then + GRUBPATH="$MOUNTPOINT/" +elif [ -f "$MOUNTPOINT/boot/menu.lst" ]; then + GRUBPATH="$MOUNTPOINT/grub/" +elif [ -f "$MOUNTPOINT/boot/grub/menu.lst" ]; then + GRUBPATH="$MOUNTPOINT/boot/grub/" +else + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "No suitable bootloader found." + return 1 +fi + +RUNNINGSYSTEMFULLPATH=$(dirname $(readlink -m "$MOUNTPOINT/$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^findiso=/ { print $2 }')")) + +ALLSYSTEMSROOT=$(dirname $RUNNINGSYSTEMFULLPATH) +RUNNINGSYSTEMNAME=$(basename $RUNNINGSYSTEMFULLPATH) +if [ "$RUNNINGSYSTEMNAME" = "X2Go-live1" ]; then + OTHERSYSTEMNAME="X2Go-live2" +elif [ "$RUNNINGSYSTEMNAME" = "X2Go-live2" ]; then + OTHERSYSTEMNAME="X2Go-live1" +else + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "Unable to determine path/name of running system." + return 1 +fi +OTHERSYSTEMFULLPATH=$(readlink -m "$ALLSYSTEMSROOT/$OTHERSYSTEMNAME") +DOWNLOADPATH=$(readlink -m "$ALLSYSTEMSROOT/X2Go-live-download/") + + +# Now we'll copy the content of the X2Go-live-download folder to our tempdir +# this is so we can run wget in update mode (-N) or rsync without needing +# write access to our boot medium (write access means increased wear and tear, +# and we want to avoid that especially for media that has no wear-leveling +# like CF cards) +# +while ! rsync -aPv --inplace --modify-window=1 $DOWNLOADPATH/ $TEMPDIR; do + echo "Sleeping 30 seconds ..." + sleep 30 + echo "Retrying ..." +done + + +# Now let's figure out if we're supposed to use wget or rsync for downloading +# +if echo "$DOWNLOADURL" | grep -q "^http" || \ + echo "$DOWNLOADURL" | grep -q "^ftp" + then + # Attempt to determine available bandwidth & to set BWLIMIT accordingly + wget -Nr -o /tmp/dl.log -P /tmp/ -nd \ + --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img + cp --update "/tmp/x2gp-tce-initrd.img" "$TEMPDIR" + rm "/tmp/x2go-tce-initrd.img" + SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \ + $7 == "-" { print $5 }' /tmp/dl.log \ + ) + case $SIZEFACTORSTRING in + "" | \ + [0-9]) echo -n "Not enough Bandwidth for update task - " + echo -n "aborting." + cleanup + return 0 + ;; + "KB/s") SIZEFACTOR=1;; + "MB/s") SIZEFACTOR=1024;; + "GB/s") SIZEFACTOR=1048576;; + *) SIZEFACTOR=$((1024*1024*1024));; + esac + DLRATE=$( awk -F' |\(|\)' ' $9 == "saved" && $7 == "-" \ + { print $4 }' /tmp/dl.log \ + ) + BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \ + awk ' { print $1*$2*$3/100 }' | \ + awk -F'.' '{ print $1 }' \ + ) # outputs integer kilobytes, not rounded + echo "Determined bandwidth limit: '$BWLIMIT KB/s'" + DOWNLOADCOMMAND="wget -Nr -l 1 -nd -P "$TEMPDIR" \ + --limit-rate=${BWLIMIT}k $DOWNLOADURL" + +elif echo "$DOWNLOADURL" | grep -q "^rsync"; then + + rsync -hh -aPv -W --inplace --log-file=/tmp/dl.log $DOWNLOADURL/x2go-tce-initrd.img \ + $TEMPDIR/x2go-tce-initrd.img.new + mv $TEMPDIR/x2go-tce-initrd.img.new $TEMPDIR/x2go-tce-initrd.img + SIZEFACTORSTRING=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \ + awk '$4 == "sent" && $12 == "bytes/sec" \ + { print $11 }' \ + ) + case $SIZEFACTORSTRING in + "" | \ + [0-9]) echo -n "Not enough Bandwidth for update task - " + echo -n "aborting." + cleanup + return 0 + ;; + "K") SIZEFACTOR=1;; + "M") SIZEFACTOR=1024;; + "G") SIZEFACTOR=$((1024*1024));; + *) SIZEFACTOR=$((1024*1024*1024));; + esac + DLRATE=$( sed -e's_\(. bytes/sec\)_ \1_' /tmp/dl.log | \ + awk '$4 == "sent" && $12 == "bytes/sec" \ + { print $10 }') + BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \ + awk ' { print $1*$2*$3/100 }' | \ + awk -F'.' '{ print $1 }' \ + ) # outputs integer kilobytes, not rounded + echo "Determined bandwidth limit: '$BWLIMIT KB/s'" + DOWNLOADCOMMAND="rsync -aPv --inplace --bwlimit=$BWLIMIT $DOWNLOADURL/ \ + $TEMPDIR" +else + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "Unsupported download mechanism." + return 1 +fi +rm /tmp/dl.log + + +# Proceed to download from update location +# +while ! $DOWNLOADCOMMAND; do + echo "Sleeping 30 seconds ..." + sleep 30 + echo "Retrying ..." +done + +# Now check if these files are different from what we already have in our +# download directory on the boot medium +# +echo "Diff'ing '$DOWNLOADPATH' '$TEMPDIR' ..." +if diff -q $DOWNLOADPATH $TEMPDIR \ + >/dev/null + + then + cleanup + echo "Nothing to do. - Files on server not newer than '$DOWNLOADPATH'." + return 0 # current is newest, nothing to do, we want to avoid + # unneccessary writes to the medium +else + echo "Differences detected. Continuing ..." +fi + + +# If we made it past that point, it's time to update the boot medium, so let's +# remount it rw and async for speed +# +if mount -oremount,rw,async $MOUNTPOINT; then + echo "Remounted '$MOUNTPOINT' as rw and async." +else + echo "Could not remount '$MOUNTPOINT' as rw and async." +fi + + +# Now, we don't want to copy an index.htm(l) file, so let's do away with that +# +rm -f $TEMPDIR/index.ht* + + +# move everything over to the boot medium +# +echo "Moving $TEMPDIR/* => $DOWNLOADPATH" +mv $TEMPDIR/* $DOWNLOADPATH +cleanup # FIXME ist dieses Cleanup gerechtfertigt oder macht es dummfoog? +if [ -n "$NTFSROOT" ]; then + echo "NTFSROOT detected. Attempting to mount '/dev/disk/by-uuid/$NTFSROOT'." + if mount -t ntfs-3g -rw /dev/disk/by-uuid/$NTFSROOT /lib/live/mount/ntfsroot; then + echo "Mount successful." + else + echo "Failed to mount NTFSROOT." + fi +fi + + +# let's check if we just downloaded a copy of our running system +# +echo "Diff'ing '$DOWNLOADPATH' '$RUNNINGSYSTEMFULLPATH'" +if diff -q $DOWNLOADPATH $RUNNINGSYSTEMFULLPATH >/dev/null && \ + [ -d "$OTHERSYSTEMFULLPATH" ] ; then + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "Nothing to do. Content of $DOWNLOADPATH equals" \ + "$RUNNINGSYSTEMNAME." + return 0 # current is newest, nothing to do, + # we want to keep the old system in OTHERSYSTEMFULLPATH + # as a fallback +fi + + +# make sure our destination path really exists +# +mkdir -p $OTHERSYSTEMFULLPATH + + +# let's check if our destination is already up to date or needs updating +# +echo "Diff'ing '$DOWNLOADPATH' '$OTHERSYSTEMFULLPATH'" +if diff -q $DOWNLOADPATH $OTHERSYSTEMFULLPATH >/dev/null; then + [ -n "$NTFSROOT" ] && umount $MOUNTPOINT + echo "Nothing to do - content of '$DOWNLOADPATH' equals"\ + "'$OTHERSYSTEMNAME'." + return 0 # OTHERSYSTEMFULLPATH is already up to date +else + # keep rsyncing until the update is complete + echo "Copying $DOWNLOADPATH/ => $OTHERSYSTEMFULLPATH" + while ! rsync -aPv --inplace --modify-window=1 $DOWNLOADPATH/ $OTHERSYSTEMFULLPATH + do + echo "Sleeping 30 seconds ..." + sleep 30 + echo "Retrying ..." + done +fi + + +# change default boot to the image we just downloaded and installed +# +if [ -n "$SYSLINUXPATH" ]; then + echo "Changing syslinux default to $OTHERSYSTEMNAME." + sed -i -e"/^default/cdefault $OTHERSYSTEMNAME" \ + $SYSLINUXPATH/syslinux.cfg + +elif [ -n "$GRUBPATH" ]; then + MENULST=$GRUBPATH/menu.lst + CURRENTDEFAULT=$(awk '/^default/ { print $2 }' $MENULST | tr -d '\r') + CURRENTTITLEPOSITION=$(grep '^title' $MENULST | + grep -n "${RUNNINGSYSTEMNAME}" | + awk -F':' '$2 ~ /'"${RUNNINGSYSTEMNAME}"'/ { print $1 }') + CURRENTTITLEPOSITION=$((CURRENTTITLEPOSITION-1)) + OTHERTITLEPOSITION=$(grep '^title' $MENULST | + grep -n "${OTHERSYSTEMNAME}" | + awk -F':' '$2 ~ /'"${OTHERSYSTEMNAME}"'/ { print $1 }') + OTHERTITLEPOSITION=$((OTHERTITLEPOSITION-1)) + if [ "$CURRENTTITLEPOSITION" = "$CURRENTDEFAULT" ]; then + echo "Changing GRUB-legacy default to $OTHERTITLEPOSITION ..." + sed -i -e"/^default/cdefault $OTHERTITLEPOSITION" \ + $MENULST + else + echo "Not changing GRUB-legacy default." + echo "Reason: We're at boot position '$CURRENTTITLEPOSITION'," + echo "while default is set to position '$CURRENTDEFAULT'." + fi +else + echo "Unsupported bootloader." +fi + +# we're on an async mount point, so let's sync to be safe +# +sync + + +# umount tempdir to free memory +# +if [ -d $TEMPDIR ]; then + cleanup +fi + + +# now, change mount back to ro and sync +# +if [ -n "$NTFSROOT" ]; then + umount $MOUNTPOINT +else + mount -oremount,ro,sync $MOUNTPOINT +fi + +) & + +} + +LiveAutoUpdateMain + -- 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 ea25162c4e4dce887a9d32727e4120a8d35ff3cc Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:08:02 2017 +0100 name change --- .../{2150-setsshkey => 2150-getsshkeyfromserver} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2150-setsshkey b/config/includes.chroot/lib/live/config/2150-getsshkeyfromserver similarity index 100% rename from config/includes.chroot/lib/live/config/2150-setsshkey rename to config/includes.chroot/lib/live/config/2150-getsshkeyfromserver -- 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 827bfbe2545556553e4fdb3548f9575693538eb0 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:07:22 2017 +0100 name change --- .../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/openbox in repository live-build-x2go. commit 1f1926f53461441730d08e51d1491a69fb68ba0b Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:10:31 2017 +0100 name change --- ...hkeyfromserver => 2150-getsshpubkeysfromserver} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2150-getsshkeyfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver similarity index 100% rename from config/includes.chroot/lib/live/config/2150-getsshkeyfromserver rename to config/includes.chroot/lib/live/config/2150-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/openbox in repository live-build-x2go. commit ebd3f74b4de074f5b86f65d84472def6ec4983cc 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/openbox in repository live-build-x2go. commit 3ec1530dc2b4c0cc4271184c3d7db3fcec830004 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:41:59 2017 +0100 added support for updatesleep parameter --- .../lib/live/config/2300-live-autoupdate | 25 ++++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 62afd3c..ee24683 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -81,17 +81,22 @@ fi # sleeping a random amount of time to ease load on the update server # +MAXSLEEPTIME=$(cat /proc/cmdline | \ + tr ' ' '\n' | \ + awk -F'=' ' /^updatesleep=/ && $2 ~ /^[0-9]*$/ { print $2 }') +if [ -z "$MAXSLEEPTIME" ] || [ $MAXSLEEPTIME -lt 120 ] ; then + MAXSLEEPTIME=900 +fi SLEEPTIME=0 -echo -n "Calculating random update delay (120-900 seconds)..." -while [ $SLEEPTIME -lt 120 ]; do - echo -n "." - # During startup, script is run with /bin/sh, - # even when #!/bin/bash is set, - # so we need to improvise. - RND=$(/bin/bash -c 'echo $RANDOM') - SLEEPTIME=$((RND%900)) -done -echo " " +echo "Calculating random update delay (120-$MAXSLEEPTIME seconds)..." +# During startup, script is run with /bin/sh, +# even when #!/bin/bash is set, +# so we need to improvise. +RND=$(/bin/bash -c 'echo $RANDOM') +SLEEPTIME=$((RND%MAXSLEEPTIME)) +if [ $SLEEPTIME -lt 120 ]; then + SLEEPTIME=$((SLEEPTIME+120)) +fi echo "Sleeping for $SLEEPTIME seconds ..." sleep $SLEEPTIME -- 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 6154bc233c7d98e22a31681a1e5a0a78be85c370 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:43:32 2017 +0100 name change --- ...{2410-getopensshkey => 2410-x2go-getopensshkey} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2410-getopensshkey b/config/includes.chroot/lib/live/config/2410-x2go-getopensshkey similarity index 100% rename from config/includes.chroot/lib/live/config/2410-getopensshkey rename to config/includes.chroot/lib/live/config/2410-x2go-getopensshkey -- 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 7a8f5fe7ee2a5a6a01ccbb7036b0a190b997e05d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:50:32 2017 +0100 name change, adapted to work with new TCE --- .../config/2410-x2go-getopensshportableclientkey | 46 ++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2410-x2go-getopensshportableclientkey b/config/includes.chroot/lib/live/config/2410-x2go-getopensshportableclientkey new file mode 100755 index 0000000..1f7b486 --- /dev/null +++ b/config/includes.chroot/lib/live/config/2410-x2go-getopensshportableclientkey @@ -0,0 +1,46 @@ +#!/bin/sh + + +X2GoGetOpenSSHPortableClientKey () +{ + # Output startup message + # + echo -n " x2go-getopensshportableclientkey" + + # This script is for using the iso-hybrid image along with the "second partition" patch + # it allows you to share ssh secret keys between X2GoClient for Windows in portable + # mode and the X2Go-ThinClientEnvironment on the same USB media using different partitions + + # Homedir of client side X2Go ThinClient Account + # + X2GOHOME="/home/user/" + + # Homedir of Portable App Installation + # + HOME="/media/PORTABLEAPP/" + + if [ -d "$HOME" ] && [ -d "$X2GOHOME" ]; then + + # create .ssh-Directory in case it doesn't exist + # + mkdir -p $(readlink -m "$X2GOHOME/.ssh/") + + for KEYFILE in $HOME/ssh/* ; do + [ -s "$KEYFILE" ] || continue + KEYDESTPATH="$X2GOHOME/.ssh/$(basename "$KEYFILE")" + touch "$KEYDESTPATH" + chown user:user \ + $KEYDESTPATH + chmod 600 $KEYDESTPATH + cat $(readlink -m "$KEYFILE")>$KEYDESTPATH + + done + + # this is so the path name in the sessions file matches again + # (cannot use .ssh on FAT, for example) + ln -s $X2GOHOME/.ssh $X2GOHOME/ssh + fi +} + +X2GoGetOpenSSHPortableClientKey + -- 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 5695de55e48a9dbc8b8387ea9b62b3966fb8cd78 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 11:00:17 2017 +0100 name change --- ...ppsettings => 2400-x2go-getportableappsessions} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsessions similarity index 100% rename from config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings rename to config/includes.chroot/lib/live/config/2400-x2go-getportableappsessions -- 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 792bff2b5786c70e85f3b88ec38c83c2a22fad4f Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 11:20:34 2017 +0100 detection of NTFSROOT when given an incomplete UUID would fail --- .../lib/live/config/2300-live-autoupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index ee24683..8c26223 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -111,7 +111,7 @@ if [ -n "$NTFSROOT" ]; then if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then NTFSROOT=$(echo $NTFSROOT | tr -d '-') if ! [ -L "/dev/disk/by-uuid/$NTFSROOT" ]; then - NTFSROOT=$(echo /dev/disk/by-uuid/*$NTFSROOT | tr ' ' '\n' | head -1) + NTFSROOT=$(basename $(echo /dev/disk/by-uuid/*$NTFSROOT | tr ' ' '\n' | head -1)) 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/openbox in repository live-build-x2go. commit f56007e3e4cd3c8094f22a3ddff7992e848e4bdf Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:59:54 2017 +0100 name change --- .../live/config/2400-x2go-getportableappsettings | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings index f565018..4e417db 100755 --- a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings +++ b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings @@ -1,11 +1,11 @@ #!/bin/sh -X2GoGetPortableAppSettings () +X2GoGetPortableAppSessions () { # Output startup message # -echo -n " x2go-getportableappsettings" +echo -n " x2go-getportableappsessions" # This script is for using the iso-hybrid image along with the "second partition" patch # it allows you to share a configuration between X2GoClient for Windows in portable @@ -20,4 +20,4 @@ else fi } -X2GoGetPortableAppSettings +X2GoGetPortableAppSessions -- 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 631b1c6a625f3781153a9cff0b5e9b1bcba71825 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:59:07 2017 +0100 undid path change --- .../live/config/2400-x2go-getportableappsettings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings index 9444f01..f565018 100755 --- a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings +++ b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings @@ -14,7 +14,7 @@ echo -n " x2go-getportableappsettings" if [ -L /dev/disk/by-label/PORTABLEAPP ]; then mkdir -p /media/PORTABLEAPP && \ mount -o sync /dev/disk/by-label/PORTABLEAPP /media/PORTABLEAPP && \ - ln -sf /media/PORTABLEAPP/x2goclient/sessions /home/user/.x2goclient/sessions + ln -sf /media/PORTABLEAPP/x2goclient/sessions /etc/x2go/x2gothinclient_sessions else true 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/openbox in repository live-build-x2go. commit 01e3ce690bbcde02e738c33d288704ae4b1c5ced Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:57:12 2017 +0100 name change, adapted to work with new TCE --- .../live/config/2400-x2go-getportableappsettings | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings index b607643..9444f01 100755 --- a/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings +++ b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings @@ -1,11 +1,11 @@ #!/bin/sh -GetPortableAppSettings () +X2GoGetPortableAppSettings () { # Output startup message # -echo -n " getportableappsettings" +echo -n " x2go-getportableappsettings" # This script is for using the iso-hybrid image along with the "second partition" patch # it allows you to share a configuration between X2GoClient for Windows in portable @@ -14,10 +14,10 @@ echo -n " getportableappsettings" if [ -L /dev/disk/by-label/PORTABLEAPP ]; then mkdir -p /media/PORTABLEAPP && \ mount -o sync /dev/disk/by-label/PORTABLEAPP /media/PORTABLEAPP && \ - ln -sf /media/PORTABLEAPP/x2goclient/sessions /etc/x2go/x2gothinclient_sessions + ln -sf /media/PORTABLEAPP/x2goclient/sessions /home/user/.x2goclient/sessions else true fi } -GetPortableAppSettings +X2GoGetPortableAppSettings -- 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 0ce542fd804f2b27ee0c173478ab2f0a147d5944 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:55:00 2017 +0100 name change --- ...ppsettings => 2400-x2go-getportableappsettings} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2400-getportableappsettings b/config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings similarity index 100% rename from config/includes.chroot/lib/live/config/2400-getportableappsettings rename to config/includes.chroot/lib/live/config/2400-x2go-getportableappsettings -- 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 7f4f971de066900bf79c88a0f9b752c71a80a691 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 10:50:53 2017 +0100 name change --- .../lib/live/config/2410-x2go-getopensshkey | 42 -------------------- 1 file changed, 42 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2410-x2go-getopensshkey b/config/includes.chroot/lib/live/config/2410-x2go-getopensshkey deleted file mode 100755 index c6b3859..0000000 --- a/config/includes.chroot/lib/live/config/2410-x2go-getopensshkey +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - - -X2GoGetOpenSSHKey () -{ -# Output startup message -# -echo -n " x2go-getopensshkey" - -# This script is for using the iso-hybrid image along with the "second partition" patch -# it allows you to share ssh secret keys between X2GoClient for Windows in portable -# mode and the X2Go-ThinClientEnvironment on the same USB media using different partitions - -# Homedir des clientseitigen X2Go-ThinClient-Accounts -# -X2GOHOME="/var/lib/x2gothinclient/" - -# Homedir der Portable-App-Installation -# -HOME="/media/PORTABLEAPP/" - -# .ssh-Directory anlegen, das existiert zu diesem Zeitpunkt noch nicht -# -mkdir -p $(readlink -m "$X2GOHOME/.ssh/") - -for KEYFILE in $HOME/ssh/* ; do - [ -s "$KEYFILE" ] || continue - KEYDESTPATH="$X2GOHOME/.ssh/$(basename "$KEYFILE")" - touch "$KEYDESTPATH" - chown x2gothinclient:x2gothinclient \ - $KEYDESTPATH - chmod 600 $KEYDESTPATH - cat $(readlink -m "$KEYFILE")>$KEYDESTPATH - -done - -ln -s $X2GOHOME/.ssh $X2GOHOME/ssh - -} - -X2GoGetOpenSSHKey - -- 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 19bff46222eeab82f1918663a34736aaf5fa59f1 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 13:33:58 2017 +0100 fixed calculation error - lower limit for maximum sleep time must be 240, as 239 might be a valid result when calculating the minimum sleep time --- .../lib/live/config/2300-live-autoupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 8c26223..6b94e2b 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -84,7 +84,7 @@ fi MAXSLEEPTIME=$(cat /proc/cmdline | \ tr ' ' '\n' | \ awk -F'=' ' /^updatesleep=/ && $2 ~ /^[0-9]*$/ { print $2 }') -if [ -z "$MAXSLEEPTIME" ] || [ $MAXSLEEPTIME -lt 120 ] ; then +if [ -z "$MAXSLEEPTIME" ] || [ $MAXSLEEPTIME -lt 240 ] ; then MAXSLEEPTIME=900 fi SLEEPTIME=0 -- 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 ac2ebc4020e5fd92f6e4ebfcfdaffed5d077afdd Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jan 14 00:50:41 2017 +0100 wget output is different for ftp, changes to SIZEFACTORSTRING and DLRATE required --- .../lib/live/config/2300-live-autoupdate | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 587a4c8..9e6a310 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -205,7 +205,8 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ cp --update "/tmp/x2go-tce-initrd.img" "$TEMPDIR" rm "/tmp/x2go-tce-initrd.img" SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \ - $7 == "-" { print $5 }' /tmp/dl.log \ + $7 == "-" { print $5 }' /tmp/dl.log | \ + tail -1 \ ) case $SIZEFACTORSTRING in "" | \ @@ -220,7 +221,8 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ *) SIZEFACTOR=$((1024*1024*1024));; esac DLRATE=$( awk -F' |\(|\)' ' $9 == "saved" && $7 == "-" \ - { print $4 }' /tmp/dl.log \ + { print $4 }' /tmp/dl.log | \ + tail -1 ) BWLIMIT=$( echo "$DLRATE $SIZEFACTOR $BWLIMITPERCENT" | \ awk ' { print $1*$2*$3/100 }' | \ -- 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 33d84f775b02bf415aa866e33cc675c338e0c3cd Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 2 16:18:13 2017 +0100 -e was missing at echo, thus literal backslash n was being printed --- .../includes.chroot/lib/live/config/2500-tcpprint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2500-tcpprint b/config/includes.chroot/lib/live/config/2500-tcpprint index 225a6ec..6026f44 100755 --- a/config/includes.chroot/lib/live/config/2500-tcpprint +++ b/config/includes.chroot/lib/live/config/2500-tcpprint @@ -28,7 +28,7 @@ if grep -q "\W*tcpprint\W*" /proc/cmdline ; then [ -d /dev/usb ] && PRINTERDEVICES=$(find /dev/usb -type c -name "lp*" | sort) PRINTERDEVICES="$PRINTERDEVICES $(find /dev/ -maxdepth 1 -type c -name "lp*" | sort)" - echo "\nSetting up local printers ..." >>/dev/tty9 + echo -e "\nSetting up local printers ..." >>/dev/tty9 # Create a listening port for a TCP/9100-RAW-printer # -- 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 ec205dee75719022b3eb5a5664836f49104b418e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 9 10:46:38 2017 +0100 added httpfs, ftpfs, nfs support --- config/package-lists/live.list.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 4993b11..9656070 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,8 +1,12 @@ console-setup console-setup-linux +curlftpfs +fuse +httpfs2 initramfs-tools kbd keyboard-configuration +libfuse2 live-boot live-config live-config-sysvinit @@ -10,6 +14,7 @@ live-tools locales login mount +nfs-common passwd sudo sysvinit-core -- 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 f510ac865600dfd61db5033976383950cb4dbfbe Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jan 9 10:47:07 2017 +0100 added usbmount and pinentry support --- config/package-lists/x2go.list.chroot | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 02aa3f3..06348e5 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,4 +1,6 @@ +cryptsetup freerdp-x11 +libfile-path-expand-perl libfreerdp-cache1.1 libfreerdp-client1.1 libfreerdp-codec1.1 @@ -41,8 +43,11 @@ libxkbfile1 libxrender1 libxv1 x2goclient +x2gousbmount +pinentry-x2go pulseaudio pulseaudio-module-x11 pulseaudio-utils rdesktop +udev zlib1g -- 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 981c5fb8a96cde8d0665a7c56906e11c8caca774 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jan 14 00:23:21 2017 +0100 typofix --- .../lib/live/config/2300-live-autoupdate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 6b94e2b..587a4c8 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -202,7 +202,7 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ # Attempt to determine available bandwidth & to set BWLIMIT accordingly wget -Nr -o /tmp/dl.log -P /tmp/ -nd \ --progress=bar:force $DOWNLOADURL/x2go-tce-initrd.img - cp --update "/tmp/x2gp-tce-initrd.img" "$TEMPDIR" + cp --update "/tmp/x2go-tce-initrd.img" "$TEMPDIR" rm "/tmp/x2go-tce-initrd.img" SIZEFACTORSTRING=$( awk -F' |\(|\)' ' $9 == "saved" && \ $7 == "-" { print $5 }' /tmp/dl.log \ -- 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 3a58f195fafb13e5eb3ce74b5e84d194760374ae Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jan 14 01:04:32 2017 +0100 changed wget output to progress bar style in all cases --- .../lib/live/config/2300-live-autoupdate | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/lib/live/config/2300-live-autoupdate b/config/includes.chroot/lib/live/config/2300-live-autoupdate index 9e6a310..8b351fd 100755 --- a/config/includes.chroot/lib/live/config/2300-live-autoupdate +++ b/config/includes.chroot/lib/live/config/2300-live-autoupdate @@ -230,6 +230,7 @@ if echo "$DOWNLOADURL" | grep -q "^http" || \ ) # outputs integer kilobytes, not rounded echo "Determined bandwidth limit: '$BWLIMIT KB/s'" DOWNLOADCOMMAND="wget -Nr -l 1 -nd -P "$TEMPDIR" \ + --progress=bar:force \ --limit-rate=${BWLIMIT}k $DOWNLOADURL" elif echo "$DOWNLOADURL" | grep -q "^rsync"; then -- 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 5e4ceb98df47736d3a32b511ad0847a4729f927c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 15 16:39:22 2017 +0100 added ca-certificates for wget ssl support --- config/package-lists/utils.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/utils.list.chroot b/config/package-lists/utils.list.chroot index bde5123..27d8716 100644 --- a/config/package-lists/utils.list.chroot +++ b/config/package-lists/utils.list.chroot @@ -1,6 +1,7 @@ acpid acpi-support atftp +ca-certificates kbd openssh-client openssh-server -- 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 e4cfc12441e587d89d0b2b90021ee5fb5799a46f 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 --- .../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/openbox in repository live-build-x2go. commit 60ef137b99b3bada5bc805c08b544532ff8b8707 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jan 15 16:44:29 2017 +0100 removed curlftpfs, not needed --- config/package-lists/live.list.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 9656070..ca96ff1 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -1,6 +1,5 @@ console-setup console-setup-linux -curlftpfs fuse httpfs2 initramfs-tools -- 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 75c71438df7759edfc4624b0e70cbef4276c5522 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 --- .../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/openbox in repository live-build-x2go. commit 19873720a4a0c38ae9a79e7928e70b58af862268 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 --- .../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
-
git-admin＠x2go.org