This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/openbox-magic-pixel-workaround-buster in repository live-build-x2go.
commit 010750762f19c0cad222db6e9d8adfaeba9da566 Author: Stefan Baur (BAUR-ITCS) <[email protected]> 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 _______________________________________________ x2go-commits mailing list [email protected] https://lists.x2go.org/listinfo/x2go-commits
