[live-build-x2go] branch feature/openbox-magic-pixel-workaround-buster created (now 58ef7f2)
This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/openbox-magic-pixel-workaround-buster in repository live-build-x2go. at 58ef7f2 Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that. This branch includes the following new commits: new b8e3df1 switched to buster repo new 2416e6e removed packages no longer available in buster new b206178 added gpg package (buster build fails early without it) new 5a91642 changed how the files are created and added some debug output as this script is currently failing on Buster, do not run this in production new 715e510 redirected debug output to file new ab5c14c Revert "redirected debug output to file" new ec99f03 typofix new 1d428d4 reversed order in which files are created new a8a712d removed offending code (/bin/boot/ path no longer exists in Buster) and debug messages - safe for production use once again new d0df082 cryptsetup is now split in 3 separate packages new 93e78f7 added required packages for freerdp2-x11 new 876792b according to a message during build, the package cryptsetup-initramfs is not required, so we're removing it. new 59851f5 added unix sockets stuff to pulseaudio spawning command so FreeRDP can use audio as well new e11d044 added x2gothinclient-usbmount and cryptsetup packages, and re-added cryptsetup-initramfs package, as we need cryptsetup and cryptsetup-initramfs for x2gothinclient-usbmount new f46d45c This is an attempt to create a bootable image for the raspberry pi. It will not do anything if the pi firmware cannot be found during the build, so it is safe even on non-ARM platforms new d34438b Revert "This is an attempt to create a bootable image for the raspberry pi. It will not do anything if the pi firmware cannot be found during the build, so it is safe even on non-ARM platforms" new eab5b9e errormessage "can't create /sys/class/graphics/fb0/blank: nonexistent directory" during boot hints at the directory being deleted and recreated during our commands (we wouldn't be at the particular position in the code, had the directory never existed at all), so we'll wait until it (re)appears before issuing our command new d53d4a6 when waiting for the device to appear, do not use sleep command but loop as fast as possible new c16b4b6 rdnssd and resolvconf packages are required for DNS resolution to work in IPv6 networks that don't use DHCPv6 (rdnssd puts name server entries in /etc/resolv.conf; resolvconf adds the "search" entry) new 86b66d7 enforcing dash for these three scripts new 8ee8912 for some silly reason, we end up with a 0-byte-sized actual resolv.conf file in /etc, which keeps resolvconf from working new bc686b8 script needs +x to work new 97dd691 this is a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963146 - the file config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround may safely be removed once this bug has been dealt with. new a556694 typofix new 4f2ff92 added update command for resolvconf, to be triggered if we encountered the broken resolv.conf file new 7ac98b3 Due to l10n, the title may be spelled with or without a blank - we need to make sure this works either way new 64c46c6 instead of trying to match the window title, match the executable name -> works across all l10n's. new 0966ca3 only run kill command if there's actually a process id to kill new 89dd0d0 added urldecoder so live-build won't choke on | symbol any more -> using %7C instead of | in build config new 02c5c1a we need to parse the urldecoded string using echo -e new e0a514d added support for MATE's screensaver, so our slides will be shown in MMD new 5dcb000 copy the files from the slides directory, not the entire folder as a subfolder to the destination new eeba2ed added branding support for MMD new 1b77a09 added background support for MMD new 829e6cd path was wrong new b01db4e force hardlink creation even if destination file already exists new 0107507 fixed race condition new 0c82ab9 this script had echo commands meant for a different shell; changed so the used parameters match the shell in use new 02177d2 unified/fixed log message output new 528948b added status message log output new 4c873e1 udevadm has a command "settle", so no need to loop and wait for it to settle. new 3c10331 added some debug output new 3aa0179 typofix new 9a1414c added further debug output new d927a88 added cross-check - we now compare /dev/disks/by-label and lsblk output before moving on new 632afc1 removed bashism new 583b277 stop spamming the log and wait 1 second between the attempts instead new 192d042 added debug output new a7448e7 feh in screensaver mode now displays slides on all screens, not only on primary new bed9244 added support for x2go-kdrive in screensaver mechanism new bb3dd3c restoring the Login Screen didn't work on xinerama displays, should be fixed now new 9bf04a1 X2GoClient needs to be forced into the foreground for the reisizing and moving to have any effect new 9af001e xdotool can't restore to fullscreen, needs wmctrl new 0819a38 do not background task in initrd new 6375039 blankdpmsfix now also supports passing a time value new a599ac5 persistent installations would shut down immediately on boot when .halt file was present, so we make sure to delete it and sync the disk new 81b06a8 /dev/disxk/by-label may contain "\x20" for blanks, this needs to be interpreted, "echo -e" is the way to do this. new 94811b7 Revert "/dev/disxk/by-label may contain "\x20" for blanks, this needs to be" new 58ef7f2 Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that. The 59 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. -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 5a916420b5b8987ffbe78b22b41d785800cc5e5e Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 20:22:24 2019 +0200 changed how the files are created and added some debug output as this script is currently failing on Buster, do not run this in production --- .../etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index f2e2a8d..c8d1741 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -27,6 +27,20 @@ sed \ -e '/^echo -n/d' \ -e 's/early/initrd/g' \ -e 's/Early/Initrd/g' \ -../../lib/live/config/0000-earlyblankdpmsfix | tee "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" +../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" +cp "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" +echo "HEREHEREHERE" +ls -lah "${DESTDIR}" +echo "XXXXXX" +ls -lah ${DESTDIR}/lib/" +echo "XXXXXX" +ls -lah "${DESTDIR}/lib/live/" +echo "XXXXXX" +ls -lah "${DESTDIR}/lib/live/boot/" +echo "XXXXXX" +ls -lah "${DESTDIR}/bin/" +echo "XXXXXX" +ls -lah "${DESTDIR}/bin/boot/" +echo "HEREHEREHERE" exit 0 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 715e5109fca76b4e4ccbc4ccaf8273957a1b703a Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 21:17:57 2019 +0200 redirected debug output to file --- .../initramfs-tools/hooks/0000-initrdblankdpmsfix | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index c8d1741..a329519 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -30,17 +30,18 @@ sed \ ../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" cp "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" -echo "HEREHEREHERE" -ls -lah "${DESTDIR}" -echo "XXXXXX" -ls -lah ${DESTDIR}/lib/" -echo "XXXXXX" -ls -lah "${DESTDIR}/lib/live/" -echo "XXXXXX" -ls -lah "${DESTDIR}/lib/live/boot/" -echo "XXXXXX" -ls -lah "${DESTDIR}/bin/" -echo "XXXXXX" -ls -lah "${DESTDIR}/bin/boot/" -echo "HEREHEREHERE" +echo "HEREHEREHERE" >/tmp/logfile +ls -lah "${DESTDIR}" >>/tmp/logfile +echo "XXXXXX" >>/tmp/logfile +ls -lah ${DESTDIR}/lib/" >>/tmp/logfile +echo "XXXXXX" >>/tmp/logfile +ls -lah "${DESTDIR}/lib/live/" >>/tmp/logfile +echo "XXXXXX" >>/tmp/logfile +ls -lah "${DESTDIR}/lib/live/boot/" >>/tmp/logfile +echo "XXXXXX" >>/tmp/logfile +ls -lah "${DESTDIR}/bin/" >>/tmp/logfile +echo "XXXXXX" >>/tmp/logfile +ls -lah "${DESTDIR}/bin/boot/" >>/tmp/logfile +echo "HEREHEREHERE" >>/tmp/logfile + exit 0 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit b8e3df145901bd70d82f356b650c2657440c2ba4 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Aug 12 17:56:15 2019 +0200 switched to buster repo --- config/archives/x2go.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index 033eeea..2355b52 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian stretch main +deb http://packages.x2go.org/debian buster main -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 2416e6ee9bfc94bca161964add9b90b6a04c34d2 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Aug 12 18:02:40 2019 +0200 removed packages no longer available in buster --- config/package-lists/x2go.list.chroot | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 9ac0c33..59b0042 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,44 +1,10 @@ cryptsetup -freerdp-x11 iso-codes libfile-path-expand-perl -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-plugins-standard -libfreerdp-primitives1.1 -libfreerdp-rail1.1 -libfreerdp-utils1.1 libjpeg62-turbo -libssl1.0.2 -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 @@ -50,7 +16,6 @@ pulseaudio-utils rdesktop udev x2goclient -x2gousbmount xfonts-100dpi xfonts-75dpi xfonts-base -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit b2061785bebee80ad49e98af5f2810d66af00b5e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Aug 12 18:07:04 2019 +0200 added gpg package (buster build fails early without it) --- 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 2e7d164..5746cd1 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -2,6 +2,7 @@ cifs-utils console-setup console-setup-linux fuse +gpg initramfs-tools kbd keyboard-configuration -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit ab5c14c8ea43c4b92f02f8001d5b03f0c71a9eae Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 21:35:15 2019 +0200 Revert "redirected debug output to file" This reverts commit 715e5109fca76b4e4ccbc4ccaf8273957a1b703a. --- .../initramfs-tools/hooks/0000-initrdblankdpmsfix | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index a329519..c8d1741 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -30,18 +30,17 @@ sed \ ../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" cp "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" -echo "HEREHEREHERE" >/tmp/logfile -ls -lah "${DESTDIR}" >>/tmp/logfile -echo "XXXXXX" >>/tmp/logfile -ls -lah ${DESTDIR}/lib/" >>/tmp/logfile -echo "XXXXXX" >>/tmp/logfile -ls -lah "${DESTDIR}/lib/live/" >>/tmp/logfile -echo "XXXXXX" >>/tmp/logfile -ls -lah "${DESTDIR}/lib/live/boot/" >>/tmp/logfile -echo "XXXXXX" >>/tmp/logfile -ls -lah "${DESTDIR}/bin/" >>/tmp/logfile -echo "XXXXXX" >>/tmp/logfile -ls -lah "${DESTDIR}/bin/boot/" >>/tmp/logfile -echo "HEREHEREHERE" >>/tmp/logfile - +echo "HEREHEREHERE" +ls -lah "${DESTDIR}" +echo "XXXXXX" +ls -lah ${DESTDIR}/lib/" +echo "XXXXXX" +ls -lah "${DESTDIR}/lib/live/" +echo "XXXXXX" +ls -lah "${DESTDIR}/lib/live/boot/" +echo "XXXXXX" +ls -lah "${DESTDIR}/bin/" +echo "XXXXXX" +ls -lah "${DESTDIR}/bin/boot/" +echo "HEREHEREHERE" exit 0 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 876792b420f7f49cbcb6adafd5d6425d516c9000 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 17:59:52 2019 +0200 according to a message during build, the package cryptsetup-initramfs is not required, so we're removing it. --- config/package-lists/x2go.list.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 43f4af4..dfa83ac 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,5 +1,4 @@ cryptsetup-bin -cryptsetup-initramfs cryptsetup-run freerdp2-x11 iso-codes -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 93e78f7616101dc9a33a42f22fdadd9e534af53f Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 16:53:18 2019 +0200 added required packages for freerdp2-x11 --- config/package-lists/x2go.list.chroot | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 913e6f0..43f4af4 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,9 +1,16 @@ cryptsetup-bin cryptsetup-initramfs cryptsetup-run +freerdp2-x11 iso-codes libfile-path-expand-perl +libfreerdp-client2-2 +libfreerdp2-2 +libgstreamer-plugins-base1.0-0 +libgstreamer1.0-0 libjpeg62-turbo +libusb-1.0-0 +libwinpr2-2 libx11-6 libxcursor1 libxext6 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit a8a712d142ad4b9e9c8d08122c5a19130734298d Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 22:07:51 2019 +0200 removed offending code (/bin/boot/ path no longer exists in Buster) and debug messages - safe for production use once again --- .../etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index 01d5bdd..92a666b 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -28,19 +28,5 @@ sed \ -e 's/early/initrd/g' \ -e 's/Early/Initrd/g' \ ../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" -cp "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" -chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" -echo "HEREHEREHERE" -ls -lah "${DESTDIR}" -echo "XXXXXX" -ls -lah "${DESTDIR}/lib/" -echo "XXXXXX" -ls -lah "${DESTDIR}/lib/live/" -echo "XXXXXX" -ls -lah "${DESTDIR}/lib/live/boot/" -echo "XXXXXX" -ls -lah "${DESTDIR}/bin/" -echo "XXXXXX" -ls -lah "${DESTDIR}/bin/boot/" -echo "HEREHEREHERE" +chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" exit 0 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit ec99f03a272ced85929b92c94a52d2016bf688d9 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 21:35:59 2019 +0200 typofix --- .../includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index c8d1741..1ecd1ef 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -33,7 +33,7 @@ chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boo echo "HEREHEREHERE" ls -lah "${DESTDIR}" echo "XXXXXX" -ls -lah ${DESTDIR}/lib/" +ls -lah "${DESTDIR}/lib/" echo "XXXXXX" ls -lah "${DESTDIR}/lib/live/" echo "XXXXXX" -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit d0df0827c580eb5fd63b40ea21c3d7328045c541 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 22:12:20 2019 +0200 cryptsetup is now split in 3 separate packages --- config/package-lists/x2go.list.chroot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 59b0042..913e6f0 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,4 +1,6 @@ -cryptsetup +cryptsetup-bin +cryptsetup-initramfs +cryptsetup-run iso-codes libfile-path-expand-perl libjpeg62-turbo -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 1d428d4960343879e52eeffa9b7b7998240c7e09 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 14 21:55:09 2019 +0200 reversed order in which files are created --- .../includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index 1ecd1ef..01d5bdd 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -27,8 +27,8 @@ sed \ -e '/^echo -n/d' \ -e 's/early/initrd/g' \ -e 's/Early/Initrd/g' \ -../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" -cp "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" +../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" +cp "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" chmod 755 "${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" "${DESTDIR}/bin/boot/0000-initrdblankdpmsfix" echo "HEREHEREHERE" ls -lah "${DESTDIR}" -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 59851f51fefb91f42f1c3ec0936c01456e234620 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Fri Aug 23 10:49:01 2019 +0200 added unix sockets stuff to pulseaudio spawning command so FreeRDP can use audio as well --- config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio index 47e9531..88c576d 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-pulseaudio @@ -1,6 +1,6 @@ # Spawn PulseAudio if ! ps -C pulseaudio >/dev/null && [ -x /usr/bin/pulseaudio ] ; then - pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' --exit-idle-time=65535 & + pulseaudio -D -n -L 'module-native-protocol-tcp port=4713' -L 'module-udev-detect' -L 'module-native-protocol-unix' --exit-idle-time=65535 & echo -en "\n$(date +'%F | %T | ')'$0' spawned PulseAudio." | tee -a /dev/tty8 else echo -en "\n$(date +'%F | %T | ')'$0' Not spawning Pulseaudio - already running (MiniDesktop active?) or executable not found." | tee -a /dev/tty8 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit d34438b11e0b9a8d59c034adb6470a5327fc2dcf Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Sep 18 21:26:13 2019 +0200 Revert "This is an attempt to create a bootable image for the raspberry pi. It will not do anything if the pi firmware cannot be found during the build, so it is safe even on non-ARM platforms" This reverts commit f46d45c2b05a5b9759a20f4b7c0acf6a23e67b5d. --- config/hooks/50-install-rpi-firmware.binary | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/config/hooks/50-install-rpi-firmware.binary b/config/hooks/50-install-rpi-firmware.binary deleted file mode 100755 index 96d1c34..0000000 --- a/config/hooks/50-install-rpi-firmware.binary +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# Installs the Raspberry PI firmware (bootloader, kernel etc) - -if [ -f chroot/boot/firmware/bootcode.bin ]; then - # This is a Raspi Build - cp -a chroot/boot binary/ - - cat >binary/cmdline.txt <<EOF -boot=live components noswap lang=de vconsole.keymap=de keyboard-layouts=de locales=de_DE.UTF-8 live-media=/dev/sda1 -EOF - - cat >binary/config.txt <<EOF -kernel $(realpath ./live/vmlinuz*) -initramfs $(realpath ./live/initrd.img*) 0x00800000 -EOF - -fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit e11d044d67cbb325ec8ede34066e75b88cce7a94 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Fri Aug 23 15:27:30 2019 +0200 added x2gothinclient-usbmount and cryptsetup packages, and re-added cryptsetup-initramfs package, as we need cryptsetup and cryptsetup-initramfs for x2gothinclient-usbmount --- config/package-lists/x2go.list.chroot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index dfa83ac..a663057 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,4 +1,6 @@ +cryptsetup cryptsetup-bin +cryptsetup-initramfs cryptsetup-run freerdp2-x11 iso-codes @@ -24,6 +26,7 @@ pulseaudio-utils rdesktop udev x2goclient +x2gothinclient-usbmount xfonts-100dpi xfonts-75dpi xfonts-base -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit f46d45c2b05a5b9759a20f4b7c0acf6a23e67b5d Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Sep 18 14:39:00 2019 +0200 This is an attempt to create a bootable image for the raspberry pi. It will not do anything if the pi firmware cannot be found during the build, so it is safe even on non-ARM platforms --- config/hooks/50-install-rpi-firmware.binary | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/config/hooks/50-install-rpi-firmware.binary b/config/hooks/50-install-rpi-firmware.binary new file mode 100755 index 0000000..96d1c34 --- /dev/null +++ b/config/hooks/50-install-rpi-firmware.binary @@ -0,0 +1,18 @@ +#!/bin/sh + +# Installs the Raspberry PI firmware (bootloader, kernel etc) + +if [ -f chroot/boot/firmware/bootcode.bin ]; then + # This is a Raspi Build + cp -a chroot/boot binary/ + + cat >binary/cmdline.txt <<EOF +boot=live components noswap lang=de vconsole.keymap=de keyboard-layouts=de locales=de_DE.UTF-8 live-media=/dev/sda1 +EOF + + cat >binary/config.txt <<EOF +kernel $(realpath ./live/vmlinuz*) +initramfs $(realpath ./live/initrd.img*) 0x00800000 +EOF + +fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit c16b4b684640e2bda80a4bf06410caeace9a2d5d Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sat Nov 30 13:50:36 2019 +0100 rdnssd and resolvconf packages are required for DNS resolution to work in IPv6 networks that don't use DHCPv6 (rdnssd puts name server entries in /etc/resolv.conf; resolvconf adds the "search" entry) --- 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 5746cd1..3c8d189 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -16,6 +16,8 @@ login mount nfs-common passwd +rdnssd +resolvconf sudo sysvinit-core sysv-rc -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit eab5b9ec6946b08e6ecf2929e283e4915ba17b03 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Oct 1 17:39:47 2019 +0200 errormessage "can't create /sys/class/graphics/fb0/blank: nonexistent directory" during boot hints at the directory being deleted and recreated during our commands (we wouldn't be at the particular position in the code, had the directory never existed at all), so we'll wait until it (re)appears before issuing our command --- config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix index 9ed721f..3d57939 100755 --- a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix +++ b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix @@ -28,8 +28,14 @@ if grep -q '\W*earlyblankdpmsfix[=\W]*' /proc/cmdline; then fi for FBDEVICE in /sys/class/graphics/fb[0-9]*; do + while ! [ -d $FBDEVICE ] ; do + $SLEEPCOMMAND + done echo 1 > $FBDEVICE/blank $SLEEPCOMMAND + while ! [ -d $FBDEVICE ] ; do + $SLEEPCOMMAND + done echo 0 > $FBDEVICE/blank done ) & -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit d53d4a679dec877b2f9173e66f114dc3b8a4e4e3 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Oct 2 14:49:12 2019 +0200 when waiting for the device to appear, do not use sleep command but loop as fast as possible --- config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix index 3d57939..4740564 100755 --- a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix +++ b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix @@ -29,12 +29,12 @@ if grep -q '\W*earlyblankdpmsfix[=\W]*' /proc/cmdline; then for FBDEVICE in /sys/class/graphics/fb[0-9]*; do while ! [ -d $FBDEVICE ] ; do - $SLEEPCOMMAND + : # NOP done echo 1 > $FBDEVICE/blank $SLEEPCOMMAND while ! [ -d $FBDEVICE ] ; do - $SLEEPCOMMAND + : # NOP done echo 0 > $FBDEVICE/blank done -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit bc686b859e48f5738cb8dea6b199a552ff984ef0 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 16:21:11 2020 +0000 script needs +x to work --- config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf old mode 100644 new mode 100755 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 86b66d72356fa81c7374a5a81e9152484d8d91c2 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Sat Nov 30 19:40:42 2019 +0100 enforcing dash for these three scripts --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 2 +- config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index c76d481..fefd693 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/dash GetSSHHostKeysFromMedia () diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia index 26726db..4303ceb 100755 --- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/dash GetSSHClientKeysFromMedia () diff --git a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions index 9d4db41..4ce2fb3 100755 --- a/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions +++ b/config/includes.chroot/lib/live/config/2280-x2go-getportableappsessions @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/dash X2GoGetPortableAppSessions () { -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 8ee8912422c68acbd1db34c60b1826276d752f86 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 16:20:06 2020 +0000 for some silly reason, we end up with a 0-byte-sized actual resolv.conf file in /etc, which keeps resolvconf from working --- config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf new file mode 100644 index 0000000..b069d79 --- /dev/null +++ b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf @@ -0,0 +1,5 @@ +#!/bin/bash +# for some silly reason, we end up with a 0-byte-sized actual resolv.conf file in /etc, which keeps resolvconf from working +if ! [ -s /etc/resolv.conf ]; then + ln -sf /etc/resolvconf/run/resolv.conf /etc/resolv.conf +fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 97dd69156a7f221a879ac5f8762c0cc6c3cbcce9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 16:52:57 2020 +0000 this is a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963146 - the file config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround may safely be removed once this bug has been dealt with. --- .../lib/live/config/0049-sysvinit-with-systemd-workaround | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround b/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround new file mode 100755 index 0000000..5b9a8fd --- /dev/null +++ b/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround @@ -0,0 +1,7 @@ +#/bin/bash +# this file is a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963146 +# it may safely be removed once this bug has been dealt with. +SYSTEMCTL_PATH=$(which systemctl) +if ! [-d /run/systemd/system ] && [ -n "$SYSTEMCTL_PATH" ]; then + chmod -x $SYSTEMCTL_PATH +fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 7ac98b30b060491bc656723cfa4e0a9b35c84060 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 19:43:48 2020 +0000 Due to l10n, the title may be spelled with or without a blank - we need to make sure this works either way --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 2d788c1..1fc442b 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -16,6 +16,7 @@ sed -i -e '/<keyboard>/,/<\/keyboard>/{//!d}' /etc/xdg/openbox/rc.xml sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml +sed -i -e '\#<applications>#a<application title="X2GoClient" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml #make sure OpenBox' ToggleMaximize is disabled, or else clicking the top row of pixels will un-maximize X2GoClient sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit a556694299529ab230f73a2e5a74a147addf68e9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 17:38:41 2020 +0000 typofix --- .../lib/live/config/0049-sysvinit-with-systemd-workaround | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround b/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround index 5b9a8fd..b7561e6 100755 --- a/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround +++ b/config/includes.chroot/lib/live/config/0049-sysvinit-with-systemd-workaround @@ -2,6 +2,6 @@ # this file is a workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963146 # it may safely be removed once this bug has been dealt with. SYSTEMCTL_PATH=$(which systemctl) -if ! [-d /run/systemd/system ] && [ -n "$SYSTEMCTL_PATH" ]; then +if ! [ -d /run/systemd/system ] && [ -n "$SYSTEMCTL_PATH" ]; then chmod -x $SYSTEMCTL_PATH fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 4f2ff92e80ac62689248696fc10aff38ebddf071 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 19:12:10 2020 +0000 added update command for resolvconf, to be triggered if we encountered the broken resolv.conf file --- config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf index b069d79..3578c6a 100755 --- a/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf +++ b/config/includes.chroot/etc/network/if-up.d/0000-fix-resolvconf @@ -2,4 +2,5 @@ # for some silly reason, we end up with a 0-byte-sized actual resolv.conf file in /etc, which keeps resolvconf from working if ! [ -s /etc/resolv.conf ]; then ln -sf /etc/resolvconf/run/resolv.conf /etc/resolv.conf + resolvconf -u fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 0966ca33ae15e5d7a43f1d151b0948f76b65796a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 21:01:54 2020 +0000 only run kill command if there's actually a process id to kill --- config/includes.chroot/etc/network/if-up.d/0100-show-sysconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf index 14ac8a4..92b4664 100755 --- a/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf +++ b/config/includes.chroot/etc/network/if-up.d/0100-show-sysconf @@ -48,5 +48,5 @@ fi [ -n "$TIMESTAMP" ] && echo "- Build Version: $TIMESTAMP ($HUMANTIMESTAMP)" | tee -a /etc/motd >> /etc/issue # make sure all unused VTs show the new /etc/issue - ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 kill -1 + ps -C getty --no-header | awk '{ print $1 }' | xargs -n 1 --no-run-if-empty kill -1 ) & -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 64c46c68cc46546b56fd15000998b1913f6287e8 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Fri Jun 19 19:53:47 2020 +0000 instead of trying to match the window title, match the executable name -> works across all l10n's. --- config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig index 1fc442b..87860ee 100755 --- a/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig +++ b/config/includes.chroot/lib/live/config/2900-x2go-thinclientconfig @@ -15,8 +15,7 @@ sed -i -e 's#<number>4</number>#<number>1</number>#' /etc/xdg/openbox/rc.xml sed -i -e '/<keyboard>/,/<\/keyboard>/{//!d}' /etc/xdg/openbox/rc.xml sed -i -e '\#<action name="ShowMenu"><menu>[a-z-]*-menu</menu></action>#d' /etc/xdg/openbox/rc.xml # make sure OpenBox maximizes X2GoClient on launch and hides window decorations -sed -i -e '\#<applications>#a<application title="X2Go Client" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml -sed -i -e '\#<applications>#a<application title="X2GoClient" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml +sed -i -e '\#<applications>#a<application name="x2goclient" type="normal">' -e '\#<applications>#a<decor>no</decor>' -e '\#<applications>#a</application>' /etc/xdg/openbox/rc.xml #make sure OpenBox' ToggleMaximize is disabled, or else clicking the top row of pixels will un-maximize X2GoClient sed -i -e '/ToggleMaximize/d' /etc/xdg/openbox/rc.xml -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 02c5c1a3779ff21c00f4278c5bf880153121c308 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 20 01:31:16 2020 +0000 we need to parse the urldecoded string using echo -e --- config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs index 3334bdb..8e4a9dc 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -28,7 +28,7 @@ if [ -n "$XSAVERIMAGES" ] ; then done echo -en "\n$(date +'%F | %T | ')'$0': Attempting screensaver image/images download ..." | tee -a /dev/tty8 - XSAVERIMAGES=$(urldecode "$XSAVERIMAGES") + XSAVERIMAGES=$(echo -e "$(urldecode "$XSAVERIMAGES")") if echo "$XSAVERIMAGES" | grep -q "^tftp://" ; then for SINGLEXSAVERIMAGEURL in ${XSAVERIMAGES//|/ }; do XSAVERIMAGESERVER=$(echo "$SINGLEXSAVERIMAGEURL" | sed 's#^tftp://\([^/;]*\)/.*$#\1#' ) -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 89dd0d0621f723996199a698554dd68358c942e7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 20 00:43:42 2020 +0000 added urldecoder so live-build won't choke on | symbol any more -> using %7C instead of | in build config --- config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs index 307dcfd..3334bdb 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -5,6 +5,10 @@ XSAVERIMAGES=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e IMAGEDIR=/var/tmp/images/ SLIDESDIR="${IMAGEDIR}/slides/" +function urldecode() { + : "${*//+/ }"; echo -e "${_//%/\\x}"; +} + mkdir -p $SLIDESDIR if [ -n "$XSAVERIMAGES" ] ; then @@ -24,6 +28,7 @@ if [ -n "$XSAVERIMAGES" ] ; then done echo -en "\n$(date +'%F | %T | ')'$0': Attempting screensaver image/images download ..." | tee -a /dev/tty8 + XSAVERIMAGES=$(urldecode "$XSAVERIMAGES") if echo "$XSAVERIMAGES" | grep -q "^tftp://" ; then for SINGLEXSAVERIMAGEURL in ${XSAVERIMAGES//|/ }; do XSAVERIMAGESERVER=$(echo "$SINGLEXSAVERIMAGEURL" | sed 's#^tftp://\([^/;]*\)/.*$#\1#' ) -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit eeba2edffcfee1570aa8f4c5884aa0fcaafe5d45 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 02:47:37 2020 +0200 added branding support for MMD --- config/includes.chroot/etc/network/if-up.d/0410-getbranding | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0410-getbranding b/config/includes.chroot/etc/network/if-up.d/0410-getbranding index 97e3ca1..f1df6b4 100755 --- a/config/includes.chroot/etc/network/if-up.d/0410-getbranding +++ b/config/includes.chroot/etc/network/if-up.d/0410-getbranding @@ -41,6 +41,12 @@ if [ -n "$BRANDINGURL" ] ; then echo -en "\n$(date +'%F | %T | ')'$0': branding SVG download complete." | tee -a /dev/tty8 if [ -s ${BRANDINGDESTINATION}.tmp ] ; then mv ${BRANDINGDESTINATION}.tmp $BRANDINGDESTINATION + ln $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg + if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then + if ! grep -q -- "--branding" /etc/x2go/x2gothinclient-minidesktop_start ; then + sed -e '\#^/usr/lib/x2goclient#a \\t\t\t --branding="/etc/x2go/x2gothinclient_branding.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start + fi + fi fi ) & fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 5dcb000aee365e430c6bae3691a4160acba88127 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 01:10:51 2020 +0200 copy the files from the slides directory, not the entire folder as a subfolder to the destination --- config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs index 2921436..02fa94a 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -62,7 +62,7 @@ if [ -n "$XSAVERIMAGES" ] ; then fi # If this directory exists, then we're a MMD and images need to go there. Hardlinking them to save space. - [ -d ${USERHOME}/Pictures ] && cp -al ${SLIDESDIR} ${USERHOME}/Pictures + [ -d ${USERHOME}/Pictures ] && cp -al ${SLIDESDIR}/* ${USERHOME}/Pictures echo -en "\n$(date +'%F | %T | ')'$0': Screensaver download complete." | tee -a /dev/tty8 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit e0a514dc132d3972be9cc109a78e4f51a2449a65 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Jun 24 23:23:30 2020 +0200 added support for MATE's screensaver, so our slides will be shown in MMD --- .../60x11-spawn-configure-slideshow-screensaver | 3 ++- .../etc/network/if-up.d/0440-getxscreensaverimgs | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index a8427a1..4f5d8c5 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -9,7 +9,8 @@ IMAGEDIR="/var/tmp/images/" SLIDESDIR="${IMAGEDIR}/slides/" -if [ -z "$XSAVERIMAGES" ] && [ -z "$XSAVERIDLETIME" ] && [ -z "$XSAVERIMGTIME" ] ; then +if [ -z "$XSAVERIMAGES" ] && [ -z "$XSAVERIDLETIME" ] && [ -z "$XSAVERIMGTIME" ] || [ -s /etc/lightdm/lightdm.conf ] ; then + # don't run when lightdm is present -> most likely MMD with MATE-Screensaver : # "exit 0" is a bad idea here, so we "NOP" instead else diff --git a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs index 8e4a9dc..2921436 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -5,6 +5,18 @@ XSAVERIMAGES=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e IMAGEDIR=/var/tmp/images/ SLIDESDIR="${IMAGEDIR}/slides/" +# if we're a MATE-MiniDesktop, let this be our homedirectory +USERHOME=$(getent passwd x2gothinclient | awk -F':' '{ print $6 }') +# No Match? Then we're a regular TCE-Live. +if [ -z "$USERHOME" ] ; then + USERHOME=$(getent passwd 1000 | awk -F':' '{ print $6 }') +else + # if this is MMD, create a directory for MATE's + # braindead slideshow screensaver that doesn't allow you to + # specify an image directory + mkdir -p ${USERHOME}/Pictures +fi + function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } @@ -49,6 +61,9 @@ if [ -n "$XSAVERIMAGES" ] ; then : # NOP fi + # If this directory exists, then we're a MMD and images need to go there. Hardlinking them to save space. + [ -d ${USERHOME}/Pictures ] && cp -al ${SLIDESDIR} ${USERHOME}/Pictures + echo -en "\n$(date +'%F | %T | ')'$0': Screensaver download complete." | tee -a /dev/tty8 ) & -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 829e6cda5c257a3f4e0b0f19eca38de3e104138c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 03:51:58 2020 +0200 path was wrong --- config/includes.chroot/etc/network/if-up.d/0410-getbranding | 2 +- config/includes.chroot/etc/network/if-up.d/0420-getbg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0410-getbranding b/config/includes.chroot/etc/network/if-up.d/0410-getbranding index f1df6b4..ad72d94 100755 --- a/config/includes.chroot/etc/network/if-up.d/0410-getbranding +++ b/config/includes.chroot/etc/network/if-up.d/0410-getbranding @@ -44,7 +44,7 @@ if [ -n "$BRANDINGURL" ] ; then ln $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then if ! grep -q -- "--branding" /etc/x2go/x2gothinclient-minidesktop_start ; then - sed -e '\#^/usr/lib/x2goclient#a \\t\t\t --branding="/etc/x2go/x2gothinclient_branding.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start + sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --branding="/etc/x2go/x2gothinclient_branding.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start fi fi fi diff --git a/config/includes.chroot/etc/network/if-up.d/0420-getbg b/config/includes.chroot/etc/network/if-up.d/0420-getbg index b37c251..a06a017 100755 --- a/config/includes.chroot/etc/network/if-up.d/0420-getbg +++ b/config/includes.chroot/etc/network/if-up.d/0420-getbg @@ -44,7 +44,7 @@ if [ -n "$BGURL" ] ; then ln $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then if ! grep -q -- "--background" /etc/x2go/x2gothinclient-minidesktop_start ; then - sed -e '\#^/usr/lib/x2goclient#a \\t\t\t --background="/etc/x2go/x2gothinclient_bg.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start + sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --background="/etc/x2go/x2gothinclient_bg.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start fi fi fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 1b77a09b98b28cb211958dd3afdbb082511786c2 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 02:49:45 2020 +0200 added background support for MMD --- config/includes.chroot/etc/network/if-up.d/0420-getbg | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0420-getbg b/config/includes.chroot/etc/network/if-up.d/0420-getbg index 323c091..b37c251 100755 --- a/config/includes.chroot/etc/network/if-up.d/0420-getbg +++ b/config/includes.chroot/etc/network/if-up.d/0420-getbg @@ -41,6 +41,12 @@ if [ -n "$BGURL" ] ; then echo -en "\n$(date +'%F | %T | ')'$0': background SVG download complete." | tee -a /dev/tty8 if [ -s ${BGDESTINATION}.tmp ] ; then mv ${BGDESTINATION}.tmp $BGDESTINATION + ln $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg + if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then + if ! grep -q -- "--background" /etc/x2go/x2gothinclient-minidesktop_start ; then + sed -e '\#^/usr/lib/x2goclient#a \\t\t\t --background="/etc/x2go/x2gothinclient_bg.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start + fi + fi fi ) & fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit b01db4e2285e9b48a5307c7e4f3bd07991b1bf14 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 03:58:12 2020 +0200 force hardlink creation even if destination file already exists --- config/includes.chroot/etc/network/if-up.d/0410-getbranding | 2 +- config/includes.chroot/etc/network/if-up.d/0420-getbg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/etc/network/if-up.d/0410-getbranding b/config/includes.chroot/etc/network/if-up.d/0410-getbranding index ad72d94..868b2b4 100755 --- a/config/includes.chroot/etc/network/if-up.d/0410-getbranding +++ b/config/includes.chroot/etc/network/if-up.d/0410-getbranding @@ -41,7 +41,7 @@ if [ -n "$BRANDINGURL" ] ; then echo -en "\n$(date +'%F | %T | ')'$0': branding SVG download complete." | tee -a /dev/tty8 if [ -s ${BRANDINGDESTINATION}.tmp ] ; then mv ${BRANDINGDESTINATION}.tmp $BRANDINGDESTINATION - ln $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg + ln -f $BRANDINGDESTINATION /etc/x2go/x2gothinclient_branding.svg if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then if ! grep -q -- "--branding" /etc/x2go/x2gothinclient-minidesktop_start ; then sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --branding="/etc/x2go/x2gothinclient_branding.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start diff --git a/config/includes.chroot/etc/network/if-up.d/0420-getbg b/config/includes.chroot/etc/network/if-up.d/0420-getbg index a06a017..cf41bbc 100755 --- a/config/includes.chroot/etc/network/if-up.d/0420-getbg +++ b/config/includes.chroot/etc/network/if-up.d/0420-getbg @@ -41,7 +41,7 @@ if [ -n "$BGURL" ] ; then echo -en "\n$(date +'%F | %T | ')'$0': background SVG download complete." | tee -a /dev/tty8 if [ -s ${BGDESTINATION}.tmp ] ; then mv ${BGDESTINATION}.tmp $BGDESTINATION - ln $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg + ln -f $BGDESTINATION /etc/x2go/x2gothinclient_bg.svg if [ -s /etc/x2go/x2gothinclient-minidesktop_start ] ; then if ! grep -q -- "--background" /etc/x2go/x2gothinclient-minidesktop_start ; then sed -e '\#^/usr/lib/x2go/x2goclient#a \\t\t\t --background="/etc/x2go/x2gothinclient_bg.svg" \\' -i /etc/x2go/x2gothinclient-minidesktop_start -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 010750762f19c0cad222db6e9d8adfaeba9da566 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 11:13:37 2020 +0200 fixed race condition --- config/includes.chroot/etc/network/if-up.d/0410-getbranding | 3 +++ config/includes.chroot/etc/network/if-up.d/0420-getbg | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/config/includes.chroot/etc/network/if-up.d/0410-getbranding b/config/includes.chroot/etc/network/if-up.d/0410-getbranding index 868b2b4..59a6261 100755 --- a/config/includes.chroot/etc/network/if-up.d/0410-getbranding +++ b/config/includes.chroot/etc/network/if-up.d/0410-getbranding @@ -48,5 +48,8 @@ if [ -n "$BRANDINGURL" ] ; then fi fi fi + touch /var/lib/live/config/getbranding ) & +else + touch /var/lib/live/config/getbranding fi diff --git a/config/includes.chroot/etc/network/if-up.d/0420-getbg b/config/includes.chroot/etc/network/if-up.d/0420-getbg index cf41bbc..f069010 100755 --- a/config/includes.chroot/etc/network/if-up.d/0420-getbg +++ b/config/includes.chroot/etc/network/if-up.d/0420-getbg @@ -20,6 +20,10 @@ if [ -n "$BGURL" ] ; then echo -en "\n$(date +'%F | %T | ')'$0' is waiting for a client IP." | tee -a /dev/tty8 sleep 2 done + while ! [ -f /var/lib/live/config/getbranding ] ; do + echo -en "\n$(date +'%F | %T | ')'$0' is waiting for getbranding to finish." + sleep 2 + done echo -en "\n$(date +'%F | %T | ')'$0': Attempting background SVG download ..." | tee -a /dev/tty8 if echo "$BGURL" | grep -q "^tftp://" ; then -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 0c82ab9fbbdb200dcd8acd09693e83c12d800079 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 15:43:21 2020 +0200 this script had echo commands meant for a different shell; changed so the used parameters match the shell in use --- .../etc/X11/Xsession.d/60x11-set-xbackground | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground index 63243fe..cfdab6a 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-set-xbackground @@ -19,16 +19,16 @@ if [ -n "$XROOT" ] ; then if echo "$XROOT" | grep -q "://" ; then # this could be an URI - echo -n "\n$(date +'%F | %T | ')'$0' URL detected." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' URL detected." | tee -a /dev/tty8 if ! [ -f "/etc/x2go/x2gothinclient-minidesktop_start" ] ; then ( while ! [ $(ls -1 $IMAGEDIR/background/* 2>/dev/null | wc -l) -gt 0 ] ; do - echo -n "\n$(date +'%F | %T | ')'$0' Waiting for image directory to populate ..." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' Waiting for image directory to populate ..." | tee -a /dev/tty8 xsetroot -grey # show that something's amiss sleep 1 done feh --no-fehbg --bg-$POSITION $IMAGEDIR/background/* - echo -n "\n$(date +'%F | %T | ')'$0' New X background image(s) has/have been set." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' New X background image(s) has/have been set." | tee -a /dev/tty8 ) & fi @@ -37,10 +37,10 @@ if [ -n "$XROOT" ] ; then HEXCOLOR=${XROOTSHORT#0x} if [ 6 = ${#HEXCOLOR} ] ; then xsetroot -solid "#$HEXCOLOR" # set requested color - echo -n "\n$(date +'%F | %T | ')'$0' New X background color has been set." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' New X background color has been set." | tee -a /dev/tty8 else xsetroot -grey # show that something's amiss - echo -n "\n$(date +'%F | %T | ')'$0' Error: X background color has been set to grey grid." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' Error: X background color has been set to grey grid." | tee -a /dev/tty8 fi else : # NOP @@ -49,7 +49,7 @@ if [ -n "$XROOT" ] ; then else # set our default color xsetroot -solid "#246ed8" - echo -n "\n$(date +'%F | %T | ')'$0' Default X background color has been set." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0' Default X background color has been set." | tee -a /dev/tty8 fi -echo -n "\n$(date +'%F | %T | ')'$0' Done." | tee -a /dev/tty8 +echo -en "\n$(date +'%F | %T | ')'$0' Done." | tee -a /dev/tty8 -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 4c873e1cfd8b967bc2c09ccdfea3ae6f58926af9 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 17:48:28 2020 +0200 udevadm has a command "settle", so no need to loop and wait for it to settle. --- .../includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 3391a61..02fa937 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -71,10 +71,9 @@ GetSSHHostKeysFromMedia () echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to start ..." | tee -a /dev/tty8 sleep 1; done - while ps --no-header -C udevadm | grep -q udevadm ; do - echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to process all events ..." | tee -a /dev/tty8 - sleep 1; - done + echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to process all events ..." | tee -a /dev/tty8 + udevadm settle + echo -n "\n$(date +'%F | %T | ')'$0' ... all events have been processed." | tee -a /dev/tty8 # list devices (and mountpoints, if present) LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 528948bb53c14045342cae8bde75eba0dad45ef4 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 16:48:44 2020 +0200 added status message log output --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index fefd693..3391a61 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -82,6 +82,8 @@ GetSSHHostKeysFromMedia () # search for our magic label X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$1 == "X2GO-TCE-LIVE" { print $2 " " $3 " " $4}') + [ -z "$X2GOTCELIVELABELS" ] && echo -n "\n$(date +'%F | %T | ')'$0' No matching 'magic' label(s) found." | tee -a /dev/tty8 + # block device list, non-removable first (for security - we don't want USB media to be able to override keys on fixed disks) BLOCKDEVS="$(echo "$X2GOTCELIVELABELS" | awk '$1 == "0" {print $2}' ) $(echo "$X2GOTCELIVELABELS" | awk '$1 == "1" {print $2}' )" -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 3c10331a3a25319f58466fa48ebae97b18e18743 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 19:45:07 2020 +0200 added some debug output --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 02fa937..dfbfa0f 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -74,6 +74,7 @@ GetSSHHostKeysFromMedia () echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to process all events ..." | tee -a /dev/tty8 udevadm settle echo -n "\n$(date +'%F | %T | ')'$0' ... all events have been processed." | tee -a /dev/tty8 + echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$(ls -lah /dev/disk/by-label * | tr '\n' '|')'." | tee -a /dev/tty8 # list devices (and mountpoints, if present) LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 02177d29d4caefc34549030a11968b46d6583369 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 16:37:24 2020 +0200 unified/fixed log message output --- config/includes.chroot/lib/live/config/2600-tcpprint | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2600-tcpprint b/config/includes.chroot/lib/live/config/2600-tcpprint index 09d6187..51c3c49 100755 --- a/config/includes.chroot/lib/live/config/2600-tcpprint +++ b/config/includes.chroot/lib/live/config/2600-tcpprint @@ -26,7 +26,7 @@ if grep -q "\W*tcpprint\W*" /proc/cmdline ; then done while ! [ -c /dev/tty8 ] ; do - echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for tty8 to become available." + echo -en "\n\$(date +'%F | %T | ')'$0' is waiting for tty8 to become available." sleep 2 done @@ -58,21 +58,21 @@ service jetdirect${PRINTERCOUNT} $TCPPRINTONLYFROM } JETDIRCONF - echo -en "\n$(date +'%F | %T | ')Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0': Mapping $PRINTERDEV => $PORTNUMBER" | tee -a /dev/tty8 PRINTERCOUNT=$((PRINTERCOUNT+1)) done echo "#Local printer config: Done." >/etc/xinetd.d/jetdirect if ps -C xinetd --no-header >/dev/null ; then - echo -en "\n$(date +'%F | %T | ')xinetd needs to be restarted, trying to do that ..." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0': xinetd needs to be restarted, trying to do that ..." | tee -a /dev/tty8 if /etc/init.d/xinetd restart; then echo -n " success. All done." | tee -a /dev/tty8 else echo -n " error." | tee -a /dev/tty8 fi else - echo -en "\n$(date +'%F | %T | ')No xinetd restart necessary. All done." | tee -a /dev/tty8 + echo -en "\n$(date +'%F | %T | ')'$0': No xinetd restart necessary. All done." | tee -a /dev/tty8 fi ) & -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit d927a881de822a68ec7ed09584f07e02055462c1 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 23:55:30 2020 +0200 added cross-check - we now compare /dev/disks/by-label and lsblk output before moving on --- .../lib/live/config/2260-getsshhostkeysfrommedia | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 807011e..b2a700c 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -74,12 +74,18 @@ GetSSHHostKeysFromMedia () echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to process all events ..." | tee -a /dev/tty8 udevadm settle echo -n "\n$(date +'%F | %T | ')'$0' ... all events have been processed." | tee -a /dev/tty8 - echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$(ls -lah /dev/disk/by-label/* | tr '\n' '|')'." | tee -a /dev/tty8 # list devices (and mountpoints, if present) - LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) - echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$(echo "$LABELMPLIST" | tr '\n' '|')'." | tee -a /dev/tty + while true; do + LABELLIST=$(ls -1 /dev/disk/by-label/ | sort -u | tr '\n' '|') # generated from /dev/disk/by-label/ + echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$LABELLIST'." | tee -a /dev/tty8 + + LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) + LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk + echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 + [ "$LABELLIST" == "$LSBLKLIST" ] && break + done # search for our magic label X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$1 == "X2GO-TCE-LIVE" { print $2 " " $3 " " $4}') -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 9a1414cf1027ae124610dcc9ff74576ea1c7153d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 23:25:07 2020 +0200 added further debug output --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index aa15e2c..807011e 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -79,6 +79,8 @@ GetSSHHostKeysFromMedia () # list devices (and mountpoints, if present) LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) + echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$(echo "$LABELMPLIST" | tr '\n' '|')'." | tee -a /dev/tty + # search for our magic label X2GOTCELIVELABELS=$(echo "$LABELMPLIST" | awk '$1 == "X2GO-TCE-LIVE" { print $2 " " $3 " " $4}') -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 3aa0179251aef7100ff1248596eb10e76a13af1d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Jun 27 22:33:50 2020 +0200 typofix --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index dfbfa0f..aa15e2c 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -74,7 +74,7 @@ GetSSHHostKeysFromMedia () echo -n "\n$(date +'%F | %T | ')'$0' Waiting for udev to process all events ..." | tee -a /dev/tty8 udevadm settle echo -n "\n$(date +'%F | %T | ')'$0' ... all events have been processed." | tee -a /dev/tty8 - echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$(ls -lah /dev/disk/by-label * | tr '\n' '|')'." | tee -a /dev/tty8 + echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$(ls -lah /dev/disk/by-label/* | tr '\n' '|')'." | tee -a /dev/tty8 # list devices (and mountpoints, if present) LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 632afc15c116150e6977df31d516cd672a715f80 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jun 28 00:53:50 2020 +0200 removed bashism --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index b2a700c..515acfa 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -84,7 +84,7 @@ GetSSHHostKeysFromMedia () LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 - [ "$LABELLIST" == "$LSBLKLIST" ] && break + [ "$LABELLIST" = "$LSBLKLIST" ] && break done # search for our magic label -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 192d042136587757ce59bdb38058631e3a8a22ef Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jun 28 20:23:07 2020 +0200 added debug output --- config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix index 4740564..201098a 100755 --- a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix +++ b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix @@ -27,17 +27,24 @@ if grep -q '\W*earlyblankdpmsfix[=\W]*' /proc/cmdline; then SLEEPCOMMAND="/bin/sleep $SLEEPTIME" fi + echo "EarlyBlankDPMSFix: attempting to force-enable displays." for FBDEVICE in /sys/class/graphics/fb[0-9]*; do + echo "Attempting to blank '$FBDEVICE'." while ! [ -d $FBDEVICE ] ; do + echo "Device '$FBDEVICE' does not (yet) exist!" : # NOP done - echo 1 > $FBDEVICE/blank + echo 1 > $FBDEVICE/blank && echo "Blanked '$FBDEVICE'." + echo "Sleeping using command '$SLEEPCOMMAND'." $SLEEPCOMMAND + echo "Attempting to unblank '$FBDEVICE'." while ! [ -d $FBDEVICE ] ; do + echo "Device '$FBDEVICE' does not (yet) exist!" : # NOP done - echo 0 > $FBDEVICE/blank + echo 0 > $FBDEVICE/blank && echo "Unblanked '$FBDEVICE'." done + echo "EarlyBlankDPMSFix: Done." ) & fi } -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit bed9244edc94675a7dc4722679dc297206a55d02 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 29 14:52:27 2020 +0200 added support for x2go-kdrive in screensaver mechanism --- .../X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index 08119ef..381582e 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -62,6 +62,15 @@ else xdotool sleep 0.1 mousemove_relative -- 11 0 sleep 0.1 mousemove_relative -- -11 0 ## Option: toggle NumLock instead # xdotool sleep 0.1 key Num_Lock sleep 0.1 key Num_Lock + elif ps -C x2gokdriveclient >/dev/null ; then # do we have an x2gokdriveclient task running? + # if so, keep kicking it into the foreground until it has focus + while [ "$(xdotool getwindowfocus)" != "$(xdotool search --classname "x2gokdriveclient")" ] ; do + xdotool search --classname "x2gokdriveclient" windowmap --sync windowfocus --sync + done + # wiggle mouse by 11 px to trigger remote screensaver password prompt (10 px is xscreensaver's default hysteresis) + xdotool sleep 0.1 mousemove_relative -- 11 0 sleep 0.1 mousemove_relative -- -11 0 + ## Option: toggle NumLock instead + # xdotool sleep 0.1 key Num_Lock sleep 0.1 key Num_Lock elif ps -C Xephyr >/dev/null ; then # do we have a Xephyr task running? # if so, keep kicking it into the foreground until it has focus while [ "$(xdotool getwindowfocus)" != "$(xdotool search --classname "Xephyr")" ] ; do -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 583b2772115859eec99fadf58f79e40e9a113e54 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jun 28 02:29:41 2020 +0200 stop spamming the log and wait 1 second between the attempts instead --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 515acfa..17ad29f 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -85,6 +85,7 @@ GetSSHHostKeysFromMedia () LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 [ "$LABELLIST" = "$LSBLKLIST" ] && break + sleep 1 done # search for our magic label -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit bb3dd3c62af0be70e9c27b27c7604cf77976bf3c Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 29 15:49:47 2020 +0200 restoring the Login Screen didn't work on xinerama displays, should be fixed now --- .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index 381582e..eddeb13 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -109,7 +109,11 @@ else # xdotool sleep 0.1 key Num_Lock sleep 0.1 key Num_Lock else # if there's no nxproxy/Xephyr/Xnest window, we're likely to be in the login screen, so restore fullscreen X2GoClient Login window - xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync 100% 100% || echo $? + PRIMARYSCREEN=$(xrandr -d :0 | awk '$3 == "primary" { print $4 }') + PRIMARYSCREENCOORD=$(echo $PRIMARYSCREEN | awk -F'+' '{ print $2 " " $3}' | tr -dc '[0-9] ') + PRIMARYSCREENSIZE=$(echo $PRIMARYSCREEN | awk -F'[x|+]' '{ print $1 " " $2}' | tr -dc '[0-9] ') + xdotool search --onlyvisible --classname "X2GoClient" windowmove --sync $PRIMARYSCREENCOORD || echo $? + xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync $PRIMARYSCREENSIZE || echo $? fi xsetroot -solid "#$HEXCOLOR" # restore old background color -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit a7448e7f4071c527c8c85591c3e60e9a7c6d0c0e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 29 14:29:59 2020 +0200 feh in screensaver mode now displays slides on all screens, not only on primary --- .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index 4f5d8c5..08119ef 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -32,7 +32,10 @@ else # if we have local images to show, spawn feh, if it isn't already running if [ $(ls $SLIDESDIR 2>/dev/null| wc -l) -gt 0 ] ; then if ! ps -C feh >/dev/null ; then - feh -Y -x -F -D $XSAVERIMGTIME -Z -B black -q "$SLIDESDIR" & + SCREENPOSITIONS=$(xrandr | awk '$2 == "connected" { print $3 $4 }' | tr -dc '[0-9]x+\n') + for SINGLESCREENPOS in $SCREENPOSITIONS; do + feh -Y -x -g $SINGLESCREENPOS -D $XSAVERIMGTIME -Z -B black -q "$SLIDESDIR" & + done fi fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 9af001e9e329cb57144fd45288d9caa571ce9bba Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 29 21:10:37 2020 +0200 xdotool can't restore to fullscreen, needs wmctrl --- .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 7 ++----- config/package-lists/xbgandscreensaver.list.chroot | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index 796fd9c..a3cd360 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -109,15 +109,12 @@ else # xdotool sleep 0.1 key Num_Lock sleep 0.1 key Num_Lock else # if there's no nxproxy/Xephyr/Xnest window, we're likely to be in the login screen, so restore fullscreen X2GoClient Login window - PRIMARYSCREEN=$(xrandr -d :0 | awk '$3 == "primary" { print $4 }') - PRIMARYSCREENCOORD=$(echo $PRIMARYSCREEN | awk -F'+' '{ print $2 " " $3}' | tr -dc '[0-9] ') - PRIMARYSCREENSIZE=$(echo $PRIMARYSCREEN | awk -F'[x|+]' '{ print $1 " " $2}' | tr -dc '[0-9] ') # keep kicking X2GoClient into the foreground until it has focus while [ "$(xdotool getwindowfocus)" != "$(xdotool search --classname "X2GoClient")" ] ; do xdotool search --classname "X2GoClient" windowmap --sync windowfocus --sync; done - xdotool search --onlyvisible --classname "X2GoClient" windowmove --sync $PRIMARYSCREENCOORD || echo $? - xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync $PRIMARYSCREENSIZE || echo $? + wmctrl -R X2GoClient -b add,fullscreen + # wmctrl -a X2GoClient -b add,maximized_vert,maximized_horz fi xsetroot -solid "#$HEXCOLOR" # restore old background color diff --git a/config/package-lists/xbgandscreensaver.list.chroot b/config/package-lists/xbgandscreensaver.list.chroot index 14eecfe..011fd25 100644 --- a/config/package-lists/xbgandscreensaver.list.chroot +++ b/config/package-lists/xbgandscreensaver.list.chroot @@ -1,2 +1,3 @@ feh +wmctrl xprintidle -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 9bf04a16ce05aef89375b2fe08487b85fe28e258 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 29 17:38:01 2020 +0200 X2GoClient needs to be forced into the foreground for the reisizing and moving to have any effect --- .../etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver index eddeb13..796fd9c 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-spawn-configure-slideshow-screensaver @@ -112,6 +112,10 @@ else PRIMARYSCREEN=$(xrandr -d :0 | awk '$3 == "primary" { print $4 }') PRIMARYSCREENCOORD=$(echo $PRIMARYSCREEN | awk -F'+' '{ print $2 " " $3}' | tr -dc '[0-9] ') PRIMARYSCREENSIZE=$(echo $PRIMARYSCREEN | awk -F'[x|+]' '{ print $1 " " $2}' | tr -dc '[0-9] ') + # keep kicking X2GoClient into the foreground until it has focus + while [ "$(xdotool getwindowfocus)" != "$(xdotool search --classname "X2GoClient")" ] ; do + xdotool search --classname "X2GoClient" windowmap --sync windowfocus --sync; + done xdotool search --onlyvisible --classname "X2GoClient" windowmove --sync $PRIMARYSCREENCOORD || echo $? xdotool search --onlyvisible --classname "X2GoClient" windowsize --sync $PRIMARYSCREENSIZE || echo $? fi -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 0819a381c87b55674b65cf76a6388169a6329772 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 30 16:17:38 2020 +0200 do not background task in initrd --- config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix index 92a666b..43725b7 100755 --- a/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix +++ b/config/includes.chroot/etc/initramfs-tools/hooks/0000-initrdblankdpmsfix @@ -25,6 +25,7 @@ fi sed \ -e 's#/bin/bash#/bin/sh#' \ -e '/^echo -n/d' \ + -e 's/ &$//' \ -e 's/early/initrd/g' \ -e 's/Early/Initrd/g' \ ../../lib/live/config/0000-earlyblankdpmsfix >"${DESTDIR}/lib/live/boot/0000-initrdblankdpmsfix" -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit a599ac5fe8c19adfa1c6c534d68e2f3c679f7774 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Wed Aug 19 22:14:15 2020 +0200 persistent installations would shut down immediately on boot when .halt file was present, so we make sure to delete it and sync the disk --- config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor index cb8d29c..7285918 100755 --- a/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor +++ b/config/includes.chroot/lib/live/config/2800-x2go-powerbuttonmonitor @@ -9,9 +9,9 @@ echo -n " x2go-powerbuttonmonitor" # determine poweroff-command if grep -q "\W*fastpo\W*" /proc/cmdline && ! [ -d ~x2gothinclient ] ; then # this does not make sense for the minidesktop - POWEROFFCOMMAND='while ! (grep "^/dev/" /etc/mtab | grep -q rw ) ; do echo s >/proc/sysrq-trigger ; echo u >/proc/sysrq-trigger ; done ; echo o >/proc/sysrq-trigger' + POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; while ! (grep "^/dev/" /etc/mtab | grep -q rw ) ; do echo s >/proc/sysrq-trigger ; echo u >/proc/sysrq-trigger ; done ; echo o >/proc/sysrq-trigger' else - POWEROFFCOMMAND='poweroff' + POWEROFFCOMMAND='rm -f /home/user/.halt ; sync ; poweroff' fi # Spawn Powerbutton-Monitor -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 6375039a09f0db5f8418582c7e80c6679f71955d Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 30 16:36:46 2020 +0200 blankdpmsfix now also supports passing a time value --- .../etc/X11/Xsession.d/60x11-blanking-dpms-config | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config index 128c503..4aad736 100644 --- a/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config +++ b/config/includes.chroot/etc/X11/Xsession.d/60x11-blanking-dpms-config @@ -1,7 +1,4 @@ # code to fix blank screen happening with DisplayPort and some buggy TFTs (xset q reports "Monitor is on" even though it is pitch black) -if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then - xset dpms force suspend -fi BLANKINGTIME=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | awk -F '=' '$1 == "blank" { print $2 }' | tr -dc '0-9:') if [ -n "$BLANKINGTIME" ]; then @@ -23,6 +20,15 @@ if [ -n "$BLANKINGTIME" ]; then fi if grep -q '\W*blankdpmsfix\W*' /proc/cmdline; then + SLEEPTIME=$(cat /proc/cmdline | tr ' ' '\n' | awk -F'=' '"blankdpmsfix"==$1 {print $2}' | tr -dc '0-9') + # SLEEPTIME is a value set in milliseconds -- not microseconds and not seconds either + [ -z "$SLEEPTIME" ] && SLEEPTIME=1000 # so we default to 1000 milliseconds = 1 second + SLEEPTIME=$(echo $SLEEPTIME | awk '{ printf "%s", $1/1000 }') # awk works for fractions so we don't need bc + SLEEPCOMMAND="/bin/sleep $SLEEPTIME" + + #xset dpms force suspend + xset dpms force off + $SLEEPCOMMAND xset dpms force on xset dpms 0 0 0 xset -dpms -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 81b06a81bda483e78d542b331693f4cc1225f378 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 18:16:55 2020 +0200 /dev/disxk/by-label may contain "\x20" for blanks, this needs to be interpreted, "echo -e" is the way to do this. --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 17ad29f..9f29e14 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -84,7 +84,7 @@ GetSSHHostKeysFromMedia () LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 - [ "$LABELLIST" = "$LSBLKLIST" ] && break + [ "$(echo -e "$LABELLIST")" = "$LSBLKLIST" ] && break sleep 1 done -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 94811b76d96de60419848b1ae06b7e1da40ad1bf Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 19:40:32 2020 +0200 Revert "/dev/disxk/by-label may contain "\x20" for blanks, this needs to be" This reverts commit b5efa0f1364163765493bb86ee17d426d0bdc244. --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 9f29e14..17ad29f 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -84,7 +84,7 @@ GetSSHHostKeysFromMedia () LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 - [ "$(echo -e "$LABELLIST")" = "$LSBLKLIST" ] && break + [ "$LABELLIST" = "$LSBLKLIST" ] && break sleep 1 done -- Alioth's /home/x2go-admin/maintenancescripts/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-magic-pixel-workaround-buster in repository live-build-x2go. commit 58ef7f2535f77804a76800b28a4d8ea9a4ad7516 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 19:45:06 2020 +0200 Labels with blanks need to have their blanks replaced with \x20, else the comparison with /dev/disk/by-label will fail; lsblk -r instad of lsblk -l does that. --- config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia index 17ad29f..a3fa000 100755 --- a/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia +++ b/config/includes.chroot/lib/live/config/2260-getsshhostkeysfrommedia @@ -81,7 +81,7 @@ GetSSHHostKeysFromMedia () LABELLIST=$(ls -1 /dev/disk/by-label/ | sort -u | tr '\n' '|') # generated from /dev/disk/by-label/ echo -n "\n$(date +'%F | %T | ')'$0' Status of /dev/disk/by-label: '$LABELLIST'." | tee -a /dev/tty8 - LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -ln) + LABELMPLIST=$(lsblk -oLABEL,RM,NAME,MOUNTPOINT -rn) LSBLKLIST=$(echo "$LABELMPLIST" | grep -v "^ " | awk '{print $1}' | sort -u | tr '\n' '|') # generated from lsblk echo -n "\n$(date +'%F | %T | ')'$0' Status of lsblk: '$LSBLKLIST'." | tee -a /dev/tty8 [ "$LABELLIST" = "$LSBLKLIST" ] && break -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
-
git-admin＠x2go.org