This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/mate-minidesktop-buster in repository live-build-x2go. at 2270552 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 d81da74 returned to regular repo, rather than nightly builds, and removed config/archives/x2go.list.binary (which provides an X2Go package source inside the live system) new f14f9d8 switched to buster repo and removed obsolete packages from package list new d56b80f Reverting this in an attempt to fetch a x2gothinclient-minidesktop package version from heuler that no longer depends on the nuvola-icon-theme package, which is no longer in buster Revert "returned to regular repo, rather than nightly builds, and removed config/archives/x2go.list.binary (which provides an X2Go package source inside the live system)" new b7df6d0 added two more required packages new c986b80 added some more required packages for a buster-based MMD new ead34f2 and yet more new packages that we will need ... new e287c62 and another one, as consolekit is not in buster, and logind is a virtual package ... new e7d60d3 and yet another ... new bb20fcb Reverting this commit in an attempt to remain systemd-free ... Revert "and yet another ..." new fde3f94 Reverting this commit in an attempt to remain systemd-free Revert "and another one, as consolekit is not in buster, and logind is a virtual package ..." new ce59077 Reverting this commit in an attempt to remain systemd-free ... Revert "and yet more new packages that we will need ..." new 782ef93 Reverting this commit in an attempt to remain systemd-free ... Revert "added some more required packages for a buster-based MMD" new 3255fd8 Reverting this commit in an attempt to remain systemd-free ... Revert "added two more required packages" new 38da376 added mate-desktop-environment-core package, as x2gothinclient-minidesktop depends on it new db693d7 added caja, gvfs-backends, mate-control-center, mate-panel, mate-polkit, mate-settings-daemon packages as mate-desktop-environment-core depends on them new 3f4cc6d added gvfs, gvfs-daemons packages because gvfs-backends depends on them, added policykit-1 package because mate-polkit depends on it new 80f38e3 added udisks2 package because gvfs-daemons depends on it, added libpam-systemd package because policykit-1 depends on it new ee6ddec added systemd-sysv package because libpam-systemd depends on it new 5baa1e4 removed sysvinit-core due to conflict with systemd package new 741ba81 changed live-config-sysvinit to live-config-systemd new 49c2add added lightdm, added libindicator3-7 liblightdm-gobject-1-0 lightdm-gtk-greeter packages, because lightdm depends on them new d8841f7 Merge commit '93e78f7616101dc9a33a42f22fdadd9e534af53f' into feature/mate-minidesktop-buster new 750a185 fixed wrong file content after broken merge new 2a824ee Merge commit '876792b420f7f49cbcb6adafd5d6425d516c9000' into feature/mate-minidesktop-buster new ac58053 on MATE, we should use the built-in screensaver ... new c040fc2 homepage-url-filter needs to parse %7C as "|" new b7be315 similar to firefox, chromium supports locked preferences as well, so let's set the homepage(s) that way, and add some sane defaults as well new 457674e this is not bash, so we can't use bashisms new 55146f7 make firefox config a conditional, in case someone builds a chrome/chromium-only image new 0e991db we need to create the directory path before we attempt to place a file there ... new 2632623 chromium needs multiple URLs separated by comma, rather than pipe, and all enclosed in double quotes new a3a9363 removed comma at the end, added new directory, as per http://www.chromium.org/administrators/linux-quick-start new 8f70c10 contrary to what the documentation says, we need square brackets for the homepage list, and a blank after each comma new a149dd6 added support for MATE's screensaver, so our slides will be shown in MMD new 58a9e1b added urldecoder so live-build won't choke on | symbol any more -> using %7C instead of | in build config new ff81e47 we need to parse the urldecoded string using echo -e new 051c76c added further config options for x2goclient, so it minimizes itself to the tray upon connect new fea35ae copy the files from the slides directory, not the entire folder as a subfolder to the destination new 74f5736 added branding support for MMD new 76fe0cb added background support for MMD new 3711982 path was wrong new a05a7ed force hardlink creation even if destination file already exists new 14aa17e fixed race condition new 02e08e7 this script had echo commands meant for a different shell; changed so the used parameters match the shell in use new df76b7e unified/fixed log message output new 38bce66 added status message log output new 61eac2d udevadm has a command "settle", so no need to loop and wait for it to settle. new cdf0e35 added some debug output new 093022d typofix new ed42dcc added further debug output new bb2338d added cross-check - we now compare /dev/disks/by-label and lsblk output before moving on new 467f342 removed bashism new f361b73 stop spamming the log and wait 1 second between the attempts instead new fc77668 added debug output new 13d31ed added more debug output new f068bf4 do not background task in initrd new 157f486 blankdpmsfix now also supports passing a time value new ce3fda6 /dev/disxk/by-label may contain "\x20" for blanks, this needs to be interpreted, "echo -e" is the way to do this. new 9fbed2b Revert "/dev/disxk/by-label may contain "\x20" for blanks, this needs to be" new 2270552 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 60 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/mate-minidesktop-buster in repository live-build-x2go. commit c986b80f0d85e07bb541850d3bc0794ec782534d Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 16:44:44 2019 +0200 added some more required packages for a buster-based MMD --- config/package-lists/mate-minidesktop.list.chroot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index d9737b7..65d0d62 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,6 +1,12 @@ +caja firefox-esr +gvfs-backends lightdm +mate-control-center mate-desktop-environment-core mate-media +mate-panel +mate-polkit +mate-settings-daemon x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit b7df6d0d8552f65ca22808981a3fd93e67bdbc32 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 16:31:57 2019 +0200 added two more required packages --- config/package-lists/mate-minidesktop.list.chroot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 8ec3af1..d9737b7 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,4 +1,6 @@ firefox-esr +lightdm +mate-desktop-environment-core mate-media x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit d81da748f97da41eee9e58a865b6d22f83fcb075 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 12:50:16 2019 +0200 returned to regular repo, rather than nightly builds, and removed config/archives/x2go.list.binary (which provides an X2Go package source inside the live system) --- config/archives/x2go.list.binary | 2 -- config/archives/x2go.list.chroot | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/archives/x2go.list.binary b/config/archives/x2go.list.binary deleted file mode 100644 index e341022..0000000 --- a/config/archives/x2go.list.binary +++ /dev/null @@ -1,2 +0,0 @@ -#deb http://packages.x2go.org/debian jessie main -deb http://packages.x2go.org/debian jessie heuler diff --git a/config/archives/x2go.list.chroot b/config/archives/x2go.list.chroot index ce323be..033eeea 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1,2 +1 @@ -#deb http://packages.x2go.org/debian stretch main -deb http://packages.x2go.org/debian stretch heuler +deb http://packages.x2go.org/debian stretch 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/mate-minidesktop-buster in repository live-build-x2go. commit d56b80fb7f0dc59f5a86edb5ff51f1ae0ad41504 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 16:29:29 2019 +0200 Reverting this in an attempt to fetch a x2gothinclient-minidesktop package version from heuler that no longer depends on the nuvola-icon-theme package, which is no longer in buster Revert "returned to regular repo, rather than nightly builds, and removed config/archives/x2go.list.binary (which provides an X2Go package source inside the live system)" This reverts commit d81da748f97da41eee9e58a865b6d22f83fcb075. --- 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 2355b52..e7da4ac 100644 --- a/config/archives/x2go.list.chroot +++ b/config/archives/x2go.list.chroot @@ -1 +1 @@ -deb http://packages.x2go.org/debian buster main +deb http://packages.x2go.org/debian buster heuler -- 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/mate-minidesktop-buster in repository live-build-x2go. commit f14f9d83296f01f2e75326cfb13457d3a10ba596 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 15:59:31 2019 +0200 switched to buster repo and removed obsolete packages from package list --- config/archives/x2go.list.chroot | 2 +- config/package-lists/x2go.list.chroot | 34 ---------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) 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 diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 9ac0c33..2cd55d8 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 -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 38da3763e16d3f435f33b94e8a0c42a0de56558b Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:10:52 2019 +0200 added mate-desktop-environment-core package, as x2gothinclient-minidesktop depends on it --- config/package-lists/mate-minidesktop.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 8ec3af1..4d45b48 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,4 +1,5 @@ firefox-esr +mate-desktop-environment-core mate-media x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit bb20fcb67f92f57c9c98a99cc243d3d84e6d7e70 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 13:55:06 2019 +0200 Reverting this commit in an attempt to remain systemd-free ... Revert "and yet another ..." This reverts commit e7d60d3378db5a35170709d8ac4d2e3ed811ae8f. --- config/package-lists/mate-minidesktop.list.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 7334e11..e2a68a4 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -12,6 +12,5 @@ mate-panel mate-polkit mate-settings-daemon policykit-1 -systemd-sysv x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 3255fd84c772c3e8d93e2bf933acb62859ed2db4 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 13:56:07 2019 +0200 Reverting this commit in an attempt to remain systemd-free ... Revert "added two more required packages" This reverts commit b7df6d0d8552f65ca22808981a3fd93e67bdbc32. --- config/package-lists/mate-minidesktop.list.chroot | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index d9737b7..8ec3af1 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,6 +1,4 @@ firefox-esr -lightdm -mate-desktop-environment-core mate-media x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 782ef93452217cc0340dffa769334fe0db5fba78 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 13:55:54 2019 +0200 Reverting this commit in an attempt to remain systemd-free ... Revert "added some more required packages for a buster-based MMD" This reverts commit c986b80f0d85e07bb541850d3bc0794ec782534d. --- config/package-lists/mate-minidesktop.list.chroot | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 65d0d62..d9737b7 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,12 +1,6 @@ -caja firefox-esr -gvfs-backends lightdm -mate-control-center mate-desktop-environment-core mate-media -mate-panel -mate-polkit -mate-settings-daemon x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit e287c6272c6ad980b05bdeeffe6c790b8ef452fd Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 17:10:22 2019 +0200 and another one, as consolekit is not in buster, and logind is a virtual package ... --- config/package-lists/mate-minidesktop.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 437effe..e2a68a4 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,9 +1,9 @@ caja -consolekit firefox-esr gvfs gvfs-backends gvfs-daemons +libpam-systemd lightdm mate-control-center mate-desktop-environment-core -- 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/mate-minidesktop-buster in repository live-build-x2go. commit e7d60d3378db5a35170709d8ac4d2e3ed811ae8f Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 17:13:16 2019 +0200 and yet another ... --- config/package-lists/mate-minidesktop.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index e2a68a4..7334e11 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -12,5 +12,6 @@ mate-panel mate-polkit mate-settings-daemon policykit-1 +systemd-sysv x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit ce59077a826d4e2ed67c9cd3d553947f70169e30 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 13:55:43 2019 +0200 Reverting this commit in an attempt to remain systemd-free ... Revert "and yet more new packages that we will need ..." This reverts commit ead34f29f75f2526c7dc2547471bd402a9383beb. --- config/package-lists/mate-minidesktop.list.chroot | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 437effe..65d0d62 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,9 +1,6 @@ caja -consolekit firefox-esr -gvfs gvfs-backends -gvfs-daemons lightdm mate-control-center mate-desktop-environment-core @@ -11,6 +8,5 @@ mate-media mate-panel mate-polkit mate-settings-daemon -policykit-1 x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit ead34f29f75f2526c7dc2547471bd402a9383beb Author: Stefan Baur <kontakt@baur-itcs.de> Date: Tue Aug 20 16:48:46 2019 +0200 and yet more new packages that we will need ... --- config/package-lists/mate-minidesktop.list.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 65d0d62..437effe 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,6 +1,9 @@ caja +consolekit firefox-esr +gvfs gvfs-backends +gvfs-daemons lightdm mate-control-center mate-desktop-environment-core @@ -8,5 +11,6 @@ mate-media mate-panel mate-polkit mate-settings-daemon +policykit-1 x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit fde3f948205d9bf0987049e47a54c5bfc1190ac2 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 13:55:29 2019 +0200 Reverting this commit in an attempt to remain systemd-free Revert "and another one, as consolekit is not in buster, and logind is a virtual package ..." This reverts commit e287c6272c6ad980b05bdeeffe6c790b8ef452fd. --- config/package-lists/mate-minidesktop.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index e2a68a4..437effe 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,9 +1,9 @@ caja +consolekit firefox-esr gvfs gvfs-backends gvfs-daemons -libpam-systemd lightdm mate-control-center mate-desktop-environment-core -- 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/mate-minidesktop-buster in repository live-build-x2go. commit ee6ddec1e998be6818c0b263e5759f73e34b5829 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:30:07 2019 +0200 added systemd-sysv package because libpam-systemd depends on it --- config/package-lists/mate-minidesktop.list.chroot | 1 + 1 file changed, 1 insertion(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 3ea7ed4..10feedb 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -11,6 +11,7 @@ mate-panel mate-polkit mate-settings-daemon policykit-1 +systemd-sysv udisks2 x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit db693d78a8d279442d3e69f178092c0ed25d19b7 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:15:50 2019 +0200 added caja, gvfs-backends, mate-control-center, mate-panel, mate-polkit, mate-settings-daemon packages as mate-desktop-environment-core depends on them --- config/package-lists/mate-minidesktop.list.chroot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 4d45b48..bc2b209 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,5 +1,11 @@ +caja firefox-esr +gvfs-backends +mate-control-center mate-desktop-environment-core mate-media +mate-panel +mate-polkit +mate-settings-daemon x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 80f38e3ef60708dc96c117d6c6261cb57b9aecd5 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:23:54 2019 +0200 added udisks2 package because gvfs-daemons depends on it, added libpam-systemd package because policykit-1 depends on it --- config/package-lists/mate-minidesktop.list.chroot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 054e1bf..3ea7ed4 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -3,6 +3,7 @@ firefox-esr gvfs gvfs-backends gvfs-daemons +libpam-systemd mate-control-center mate-desktop-environment-core mate-media @@ -10,5 +11,6 @@ mate-panel mate-polkit mate-settings-daemon policykit-1 +udisks2 x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 3f4cc6d443592b8e5c851b5fdd762f56f89b6dae Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:19:56 2019 +0200 added gvfs, gvfs-daemons packages because gvfs-backends depends on them, added policykit-1 package because mate-polkit depends on it --- config/package-lists/mate-minidesktop.list.chroot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index bc2b209..054e1bf 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -1,11 +1,14 @@ caja firefox-esr +gvfs gvfs-backends +gvfs-daemons mate-control-center mate-desktop-environment-core mate-media mate-panel mate-polkit mate-settings-daemon +policykit-1 x2gothinclient-minidesktop x2gothinclient-usbmount -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 49c2add2d462ec6365fdf3c6410b778a79951eee Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 15:53:21 2019 +0200 added lightdm, added libindicator3-7 liblightdm-gobject-1-0 lightdm-gtk-greeter packages, because lightdm depends on them --- config/package-lists/mate-minidesktop.list.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index 10feedb..c94a5c3 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -3,7 +3,11 @@ firefox-esr gvfs gvfs-backends gvfs-daemons +libindicator3-7 +liblightdm-gobject-1-0 libpam-systemd +lightdm +lightdm-gtk-greeter mate-control-center mate-desktop-environment-core mate-media -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 5baa1e40d10e353680060a3e45dd4b62ea767463 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:34:10 2019 +0200 removed sysvinit-core due to conflict with systemd package --- config/package-lists/live.list.chroot | 1 - 1 file changed, 1 deletion(-) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 2e7d164..69d0f55 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -16,6 +16,5 @@ mount nfs-common passwd sudo -sysvinit-core sysv-rc user-setup -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 741ba817a19858ddfa310a2885d44459ec83cfd4 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 14:37:34 2019 +0200 changed live-config-sysvinit to live-config-systemd --- config/package-lists/live.list.chroot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/package-lists/live.list.chroot b/config/package-lists/live.list.chroot index 69d0f55..cd9e29e 100644 --- a/config/package-lists/live.list.chroot +++ b/config/package-lists/live.list.chroot @@ -8,7 +8,7 @@ keyboard-configuration libfuse2 live-boot live-config -live-config-sysvinit +live-config-systemd live-tools locales login -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 2a824ee37c411a75cfb3558d11bd5487daf05fa8 Merge: 750a185 876792b Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 18:01:28 2019 +0200 Merge commit '876792b420f7f49cbcb6adafd5d6425d516c9000' into feature/mate-minidesktop-buster config/package-lists/x2go.list.chroot | 1 - 1 file changed, 1 deletion(-) -- 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/mate-minidesktop-buster in repository live-build-x2go. commit d8841f7f15f2451d2c4a1ca44ceec351ae406375 Merge: 49c2add 93e78f7 Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 16:56:33 2019 +0200 Merge commit '93e78f7616101dc9a33a42f22fdadd9e534af53f' into feature/mate-minidesktop-buster .../X11/Xsession.d/60x11-magic-pixel-workaround | 25 ++++++++++++++++++++++ .../initramfs-tools/hooks/0000-initrdblankdpmsfix | 4 ++-- config/package-lists/live.list.chroot | 1 + .../magic-pixel-workaround.list.chroot | 3 +++ config/package-lists/x2go.list.chroot | 14 +++++++++++- 5 files changed, 44 insertions(+), 3 deletions(-) diff --cc config/package-lists/x2go.list.chroot index 2cd55d8,43f4af4..6ea54a3 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@@ -1,7 -1,16 +1,20 @@@ +cryptsetup +iso-codes +libfile-path-expand-perl +libjpeg62-turbo + 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/mate-minidesktop-buster in repository live-build-x2go. commit ac580536d4f4dbf659de8d36d7c143164e93117a Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 17:05:30 2020 +0200 on MATE, we should use the built-in screensaver ... --- config/package-lists/mate-minidesktop.list.chroot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/package-lists/mate-minidesktop.list.chroot b/config/package-lists/mate-minidesktop.list.chroot index c94a5c3..77cacc6 100644 --- a/config/package-lists/mate-minidesktop.list.chroot +++ b/config/package-lists/mate-minidesktop.list.chroot @@ -3,6 +3,8 @@ firefox-esr gvfs gvfs-backends gvfs-daemons +libcanberra-gtk-module +libcanberra-gtk3-module libindicator3-7 liblightdm-gobject-1-0 libpam-systemd @@ -14,6 +16,8 @@ mate-media mate-panel mate-polkit mate-settings-daemon +mate-screensaver +mate-screensaver-common policykit-1 systemd-sysv udisks2 -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 750a185b1dc3b7656a92a68471aef05b7ec66e5a Author: Stefan Baur <kontakt@baur-itcs.de> Date: Wed Aug 21 16:58:04 2019 +0200 fixed wrong file content after broken merge --- config/package-lists/x2go.list.chroot | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/package-lists/x2go.list.chroot b/config/package-lists/x2go.list.chroot index 6ea54a3..43f4af4 100644 --- a/config/package-lists/x2go.list.chroot +++ b/config/package-lists/x2go.list.chroot @@ -1,7 +1,3 @@ -cryptsetup -iso-codes -libfile-path-expand-perl -libjpeg62-turbo cryptsetup-bin cryptsetup-initramfs cryptsetup-run -- 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/mate-minidesktop-buster in repository live-build-x2go. commit c040fc213e89b35fcb1db9ff651b316c95e2a864 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 20:34:13 2020 +0200 homepage-url-filter needs to parse %7C as "|" --- config/includes.chroot/lib/live/config/2900-firefox-config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2900-firefox-config b/config/includes.chroot/lib/live/config/2900-firefox-config index 18acfb6..aec8a7e 100755 --- a/config/includes.chroot/lib/live/config/2900-firefox-config +++ b/config/includes.chroot/lib/live/config/2900-firefox-config @@ -1,5 +1,9 @@ #!/bin/sh +function urldecode() { + : "${*//+/ }"; echo -e "${_//%/\\x}"; + } + FirefoxConfig () { # Output startup message @@ -10,6 +14,8 @@ FirefoxConfig () awk -F'=' ' /^homepageurl=/ { print $2 } ') if [ -z "$HOMEPAGEURL" ] ; then HOMEPAGEURL='http://www.x2go.org/' + else + HOMEPAGEURL=$(echo -e "$(urldecode "$HOMEPAGEURL")") fi sed -i -e '/"browser.rights.3.shown"/d' \ -e '/"browser.startup.homepage_override.mstone"/d' \ -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 55146f7fd5ba9b2c439541722596ac6af51d06be Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 22:23:32 2020 +0200 make firefox config a conditional, in case someone builds a chrome/chromium-only image --- config/includes.chroot/lib/live/config/2900-firefox-config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-firefox-config b/config/includes.chroot/lib/live/config/2900-firefox-config index aec8a7e..7defe7c 100755 --- a/config/includes.chroot/lib/live/config/2900-firefox-config +++ b/config/includes.chroot/lib/live/config/2900-firefox-config @@ -33,4 +33,6 @@ lockPref("browser.startup.homepage", "$HOMEPAGEURL"); FIREFOXCONFIG } -FirefoxConfig +if which firefox-esr >/dev/null || which firefox >/dev/null; then + FirefoxConfig +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/mate-minidesktop-buster in repository live-build-x2go. commit 457674eeb848fda5b0a749225f1c991431aecad8 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 22:22:00 2020 +0200 this is not bash, so we can't use bashisms --- config/includes.chroot/lib/live/config/2900-chromium-config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config index 3edc84d..68b8565 100755 --- a/config/includes.chroot/lib/live/config/2900-chromium-config +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -52,4 +52,6 @@ ChromiumConfig () CHROMIUMCONFIG } -( which chromium >/dev/null || which chromium-browser >/dev/null || which chrome >/dev/null || which chrome-broser >/dev/null ) && ChromiumConfig +if which chromium >/dev/null || which chromium-browser >/dev/null || which chrome >/dev/null || which chrome-broser >/dev/null; then + ChromiumConfig +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/mate-minidesktop-buster in repository live-build-x2go. commit b7be315dae62dc577d9bffa8870cb8c03ecb3524 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 20:43:47 2020 +0200 similar to firefox, chromium supports locked preferences as well, so let's set the homepage(s) that way, and add some sane defaults as well --- .../lib/live/config/2900-chromium-config | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config new file mode 100755 index 0000000..3edc84d --- /dev/null +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -0,0 +1,55 @@ +#!/bin/sh + +function urldecode() { + : "${*//+/ }"; echo -e "${_//%/\\x}"; + } + +ChromiumConfig () +{ + # Output startup message + # + echo -n " chromiumconfig" + + HOMEPAGEURL=$(sed -e 's/ \([^ ]*\)=/\n\1=/g' -e 's/\([^=]["'"'"']\) /\1\n/g' -e 's/ \([^ "'"'"']\)/\n\1/g' /proc/cmdline | \ + awk -F'=' ' /^homepageurl=/ { print $2 } ') + if [ -z "$HOMEPAGEURL" ] ; then + HOMEPAGEURL='http://www.x2go.org/' + else + HOMEPAGEURL=$(echo -e "$(urldecode "$HOMEPAGEURL")") + fi + cat >/etc/chromium/policies/managed/chromium.json <<CHROMIUMCONFIG + +// Policy template for Linux. +// Documentation for this file can be found at +// https://www.chromium.org/administrators/policy-list-3 +// and/or +// https://cloud.google.com/docs/chrome-enterprise/policies/ + +{ + "AllowFileSelectionDialogs": false, + "DownloadDirectory": "/home/\${user_name}/Downloads", + "EditBookmarksEnabled": false, + "HomepageIsNewTabPage": false, + "HomepageLocation": "$HOMEPAGEURL", + "ImportBookmarks": false, + "ImportHistory": false, + "ImportHomepage": false, + "ImportSavedPasswords": false, + "ImportSearchEngine": false, + //"ProxyBypassList": "http://www.example1.com,http://www.example2.com,http://internalsite/", + //"ProxyMode": "direct", + //"ProxyPacUrl": "http://internal.site/example.pac", + //"ProxyServer": "123.123.123.123:8080", + "RestoreOnStartup": 4, + // 5 = Open New Tab Page + // 1 = Restore the last session + // 4 = Open a list of URLs + "RestoreOnStartupURLs": ["$HOMEPAGEURL"], + "ShowHomeButton": true, + "SyncDisabled": true, + "TranslateEnabled": false, +} +CHROMIUMCONFIG +} + +( which chromium >/dev/null || which chromium-browser >/dev/null || which chrome >/dev/null || which chrome-broser >/dev/null ) && ChromiumConfig -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 8f70c10e661335d4a43bf66d464455185ca08a90 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Tue Jun 23 00:11:12 2020 +0200 contrary to what the documentation says, we need square brackets for the homepage list, and a blank after each comma --- config/includes.chroot/lib/live/config/2900-chromium-config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config index c2f134b..cb58e6f 100755 --- a/config/includes.chroot/lib/live/config/2900-chromium-config +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -15,7 +15,7 @@ ChromiumConfig () if [ -z "$HOMEPAGEURL" ] ; then HOMEPAGEURL='http://www.x2go.org/' else - HOMEPAGEURL=$(echo -e '"'"$(urldecode "$HOMEPAGEURL")"'"' | sed -e 's#|#","#g') + HOMEPAGEURL=$(echo -e '"'"$(urldecode "$HOMEPAGEURL")"'"' | sed -e 's#|#", "#g') fi mkdir -p /etc/chromium/policies/managed mkdir -p /etc/chromium/policies/recommended @@ -32,7 +32,7 @@ ChromiumConfig () "DownloadDirectory": "/home/\${user_name}/Downloads", "EditBookmarksEnabled": false, "HomepageIsNewTabPage": false, - "HomepageLocation": $HOMEPAGEURL, + "HomepageLocation": [$HOMEPAGEURL], "ImportBookmarks": false, "ImportHistory": false, "ImportHomepage": false, -- 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/mate-minidesktop-buster in repository live-build-x2go. commit a149dd67da5f60e7c58266308530aa98a56d0790 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 307dcfd..0361b2a 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 + mkdir -p $SLIDESDIR if [ -n "$XSAVERIMAGES" ] ; then @@ -44,6 +56,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/mate-minidesktop-buster in repository live-build-x2go. commit 0e991db7f1590733e405fdd723ec5f63b69cc8eb Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 22:48:05 2020 +0200 we need to create the directory path before we attempt to place a file there ... --- config/includes.chroot/lib/live/config/2900-chromium-config | 1 + 1 file changed, 1 insertion(+) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config index 68b8565..f703084 100755 --- a/config/includes.chroot/lib/live/config/2900-chromium-config +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -17,6 +17,7 @@ ChromiumConfig () else HOMEPAGEURL=$(echo -e "$(urldecode "$HOMEPAGEURL")") fi + mkdir -p /etc/chromium/policies/managed cat >/etc/chromium/policies/managed/chromium.json <<CHROMIUMCONFIG // Policy template for Linux. -- 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/mate-minidesktop-buster in repository live-build-x2go. commit a3a9363a979f989d3477d3867d3bf06aeac6458e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 23:42:12 2020 +0200 removed comma at the end, added new directory, as per http://www.chromium.org/administrators/linux-quick-start --- config/includes.chroot/lib/live/config/2900-chromium-config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config index 34447b7..c2f134b 100755 --- a/config/includes.chroot/lib/live/config/2900-chromium-config +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -18,6 +18,7 @@ ChromiumConfig () HOMEPAGEURL=$(echo -e '"'"$(urldecode "$HOMEPAGEURL")"'"' | sed -e 's#|#","#g') fi mkdir -p /etc/chromium/policies/managed + mkdir -p /etc/chromium/policies/recommended cat >/etc/chromium/policies/managed/chromium.json <<CHROMIUMCONFIG // Policy template for Linux. @@ -48,7 +49,7 @@ ChromiumConfig () "RestoreOnStartupURLs": [$HOMEPAGEURL], "ShowHomeButton": true, "SyncDisabled": true, - "TranslateEnabled": false, + "TranslateEnabled": false } CHROMIUMCONFIG } -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 263262339591cb49a53df7dd0fb8418470e7e692 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jun 22 23:07:24 2020 +0200 chromium needs multiple URLs separated by comma, rather than pipe, and all enclosed in double quotes --- config/includes.chroot/lib/live/config/2900-chromium-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2900-chromium-config b/config/includes.chroot/lib/live/config/2900-chromium-config index f703084..34447b7 100755 --- a/config/includes.chroot/lib/live/config/2900-chromium-config +++ b/config/includes.chroot/lib/live/config/2900-chromium-config @@ -15,7 +15,7 @@ ChromiumConfig () if [ -z "$HOMEPAGEURL" ] ; then HOMEPAGEURL='http://www.x2go.org/' else - HOMEPAGEURL=$(echo -e "$(urldecode "$HOMEPAGEURL")") + HOMEPAGEURL=$(echo -e '"'"$(urldecode "$HOMEPAGEURL")"'"' | sed -e 's#|#","#g') fi mkdir -p /etc/chromium/policies/managed cat >/etc/chromium/policies/managed/chromium.json <<CHROMIUMCONFIG @@ -31,7 +31,7 @@ ChromiumConfig () "DownloadDirectory": "/home/\${user_name}/Downloads", "EditBookmarksEnabled": false, "HomepageIsNewTabPage": false, - "HomepageLocation": "$HOMEPAGEURL", + "HomepageLocation": $HOMEPAGEURL, "ImportBookmarks": false, "ImportHistory": false, "ImportHomepage": false, @@ -45,7 +45,7 @@ ChromiumConfig () // 5 = Open New Tab Page // 1 = Restore the last session // 4 = Open a list of URLs - "RestoreOnStartupURLs": ["$HOMEPAGEURL"], + "RestoreOnStartupURLs": [$HOMEPAGEURL], "ShowHomeButton": true, "SyncDisabled": true, "TranslateEnabled": false, -- 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/mate-minidesktop-buster in repository live-build-x2go. commit 58a9e1bcf3429f2f6450dafa3aaa383af327db2c 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 0361b2a..230095d 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -17,6 +17,10 @@ else mkdir -p ${USERHOME}/Pictures fi +function urldecode() { + : "${*//+/ }"; echo -e "${_//%/\\x}"; +} + mkdir -p $SLIDESDIR if [ -n "$XSAVERIMAGES" ] ; then @@ -36,6 +40,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/mate-minidesktop-buster in repository live-build-x2go. commit ff81e47c7726ea59648c377602b2f5eb596fdec3 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 230095d..2921436 100755 --- a/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs +++ b/config/includes.chroot/etc/network/if-up.d/0440-getxscreensaverimgs @@ -40,7 +40,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/mate-minidesktop-buster in repository live-build-x2go. commit 051c76c1a7cae35eb23578dfb068c21a591c8fda Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Thu Jun 25 01:00:01 2020 +0200 added further config options for x2goclient, so it minimizes itself to the tray upon connect --- .../etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray index b8d3210..a0476bd 100755 --- a/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray +++ b/config/includes.chroot/etc/x2go/x2gothinclient_init.d/020_x2gothinclient-confine-to-tray @@ -24,6 +24,10 @@ if [ -z "$X2GO_HANDLE_DAEMON" ] ; then mkdir -p ~x2gothinclient/.x2goclient echo '[trayicon]' >>~x2gothinclient/.x2goclient/settings echo 'enabled=true' >>~x2gothinclient/.x2goclient/settings + echo 'mintotray=true' >>~x2gothinclient/.x2goclient/settings + echo 'noclose=true' >>~x2gothinclient/.x2goclient/settings + echo 'mincon=true' >>~x2gothinclient/.x2goclient/settings + echo 'maxdiscon=true' >>~x2gothinclient/.x2goclient/settings chown x2gothinclient:x2gothinclient ~x2gothinclient -Rf chmod go-rwx ~x2gothinclient -Rf 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/mate-minidesktop-buster in repository live-build-x2go. commit fea35ae6ad958b314d1084d09074abb2107c6cce 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/mate-minidesktop-buster in repository live-build-x2go. commit 74f573692cdf83ab08814db5367935deed3d4297 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/mate-minidesktop-buster in repository live-build-x2go. commit 76fe0cb56fa10ea1ce7efede248cfc0f699fbac9 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/mate-minidesktop-buster in repository live-build-x2go. commit 02e08e71878dad7092d51a0a933ac2b82c0669bc 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/mate-minidesktop-buster in repository live-build-x2go. commit 14aa17ecb81a02d0a1159eab8338fd8024e90dc3 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/mate-minidesktop-buster in repository live-build-x2go. commit 37119824780d49eca68d3189e48ad804b79d2f2d 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/mate-minidesktop-buster in repository live-build-x2go. commit a05a7ede8c9b85b971f348766b0388b734d5a4b5 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/mate-minidesktop-buster in repository live-build-x2go. commit df76b7e26c15f239de4486e20f3aa7c65cec1b38 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/mate-minidesktop-buster in repository live-build-x2go. commit 61eac2d6070532c4aa7710615f6a23a95ffc3138 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 bf0681c..250cda1 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/mate-minidesktop-buster in repository live-build-x2go. commit 38bce66415a0b0612e4dd2757e4c39790a16f400 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 c76d481..bf0681c 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/mate-minidesktop-buster in repository live-build-x2go. commit ed42dcccd9771fadd43952da3e4aba5512c78ef8 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 cba0b5f..63cb4ae 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/mate-minidesktop-buster in repository live-build-x2go. commit bb2338df5bbaa29ed653aac8f8f1c91fe3a0d624 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 63cb4ae..1f55119 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/mate-minidesktop-buster in repository live-build-x2go. commit cdf0e35894f3c603d53ccb3d6e3f3a9bc335720c 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 250cda1..5531da9 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/mate-minidesktop-buster in repository live-build-x2go. commit 093022d9e760309ded04f999a90cd6f452f5e7ce 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 5531da9..cba0b5f 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/mate-minidesktop-buster in repository live-build-x2go. commit f361b73a922386ee107b894c74c8647680028ab6 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 97f5148..2fa84b3 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/mate-minidesktop-buster in repository live-build-x2go. commit 13d31ed097bd005d15b9f7947e82dec1f4c6e2e6 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jun 28 21:34:40 2020 +0200 added more debug output --- .../includes.chroot/lib/live/config/0000-earlyblankdpmsfix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix index 201098a..57f6782 100755 --- a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix +++ b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix @@ -29,20 +29,20 @@ if grep -q '\W*earlyblankdpmsfix[=\W]*' /proc/cmdline; then echo "EarlyBlankDPMSFix: attempting to force-enable displays." for FBDEVICE in /sys/class/graphics/fb[0-9]*; do - echo "Attempting to blank '$FBDEVICE'." + echo "EarlyBlankDPMSFix: Attempting to blank '$FBDEVICE'." while ! [ -d $FBDEVICE ] ; do - echo "Device '$FBDEVICE' does not (yet) exist!" + echo "EarlyBlankDPMSFix: Device '$FBDEVICE' does not (yet) exist!" : # NOP done - echo 1 > $FBDEVICE/blank && echo "Blanked '$FBDEVICE'." - echo "Sleeping using command '$SLEEPCOMMAND'." + echo 1 > $FBDEVICE/blank && echo "EarlyBlankDPMSFix: Blanked '$FBDEVICE'." + echo "EarlyBlankDPMSFix: Sleeping using command '$SLEEPCOMMAND'." $SLEEPCOMMAND - echo "Attempting to unblank '$FBDEVICE'." + echo "EarlyBlankDPMSFix: Attempting to unblank '$FBDEVICE'." while ! [ -d $FBDEVICE ] ; do - echo "Device '$FBDEVICE' does not (yet) exist!" + echo "EarlyBlankDPMSFix: Device '$FBDEVICE' does not (yet) exist!" : # NOP done - echo 0 > $FBDEVICE/blank && echo "Unblanked '$FBDEVICE'." + echo 0 > $FBDEVICE/blank && echo "EarlyBlankDPMSFix: Unblanked '$FBDEVICE'." done echo "EarlyBlankDPMSFix: 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/mate-minidesktop-buster in repository live-build-x2go. commit fc776687cd0ea050b135bb2bcfaa06321236b7fd Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Jun 28 20:23:07 2020 +0200 added debug output --- .../lib/live/config/0000-earlyblankdpmsfix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix index 9ed721f..201098a 100755 --- a/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix +++ b/config/includes.chroot/lib/live/config/0000-earlyblankdpmsfix @@ -27,11 +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 1 > $FBDEVICE/blank + echo "Attempting to blank '$FBDEVICE'." + while ! [ -d $FBDEVICE ] ; do + echo "Device '$FBDEVICE' does not (yet) exist!" + : # NOP + done + echo 1 > $FBDEVICE/blank && echo "Blanked '$FBDEVICE'." + echo "Sleeping using command '$SLEEPCOMMAND'." $SLEEPCOMMAND - echo 0 > $FBDEVICE/blank + echo "Attempting to unblank '$FBDEVICE'." + while ! [ -d $FBDEVICE ] ; do + echo "Device '$FBDEVICE' does not (yet) exist!" + : # NOP + done + 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/mate-minidesktop-buster in repository live-build-x2go. commit 467f342c6206471a88c985090c62882da0a83cbe 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 1f55119..97f5148 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/mate-minidesktop-buster in repository live-build-x2go. commit 22705527f8c34c62d2e5068e4b2e07454dd57ff3 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 2fa84b3..4013e59 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
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop-buster in repository live-build-x2go. commit 9fbed2bd67538ff13fdc41960dad9506df55b626 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sat Aug 22 19:40:57 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 ff93031..2fa84b3 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/mate-minidesktop-buster in repository live-build-x2go. commit f068bf4cc8c41873eaed802a0fa4d93bfcd407ed 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/mate-minidesktop-buster in repository live-build-x2go. commit ce3fda6292c361c0a39480d1e6782323b04fd688 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 2fa84b3..ff93031 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/mate-minidesktop-buster in repository live-build-x2go. commit 157f48697b91b1671544362c58ee22bc0df060fc 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
-
git-admin＠x2go.org