This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/mate-minidesktop in repository live-build-x2go. commit 36fca82327c80b8147ee611266a2e797c3ddf27e Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Mon Jul 24 01:22:07 2017 +0200 do not trigger on METHOD="none" (which is set when IFACE="--all") --- config/includes.chroot/lib/live/config/2000-settime | 4 +--- config/includes.chroot/lib/live/config/2100-showifconfig | 2 +- config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver | 2 +- config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf | 2 +- config/includes.chroot/lib/live/config/2700-x2go-getsessions | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/config/includes.chroot/lib/live/config/2000-settime b/config/includes.chroot/lib/live/config/2000-settime index e41b57f..40468b0 100755 --- a/config/includes.chroot/lib/live/config/2000-settime +++ b/config/includes.chroot/lib/live/config/2000-settime @@ -11,7 +11,7 @@ cat >/etc/network/if-up.d/0050-settime <<SETTIME #!/bin/bash export TERM=linux; -if [ "\$METHOD" = loopback ]; then +if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi @@ -21,8 +21,6 @@ fi sleep 2 done - echo -en "\n'\$0': DEBUG: METHOD is '\$METHOD', IFACE is '\$IFACE'." | tee -a /dev/tty8 - while [ -z "\$(hostname -I)" ] ; do echo -en "\n'\$0' is waiting for a client IP." | tee -a /dev/tty8 sleep 2 diff --git a/config/includes.chroot/lib/live/config/2100-showifconfig b/config/includes.chroot/lib/live/config/2100-showifconfig index c45f67e..9ccb02b 100755 --- a/config/includes.chroot/lib/live/config/2100-showifconfig +++ b/config/includes.chroot/lib/live/config/2100-showifconfig @@ -14,7 +14,7 @@ cat >/etc/network/if-up.d/0100-showips <<SHOWIPS #!/bin/bash export TERM=linux; -if [ "\$METHOD" = loopback ]; then +if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi diff --git a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver index c25c709..4f2abfd 100755 --- a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver +++ b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver @@ -17,7 +17,7 @@ GetSSHPubKeysFromServer () #!/bin/bash export TERM=linux; -if [ "\$METHOD" = loopback ]; then +if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi diff --git a/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf index 5c36309..f8d7eb4 100755 --- a/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf +++ b/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf @@ -15,7 +15,7 @@ echo -n " xserver-xorg-getxorgconf" #!/bin/bash export TERM=linux; -if [ "\$METHOD" = loopback ]; then +if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi diff --git a/config/includes.chroot/lib/live/config/2700-x2go-getsessions b/config/includes.chroot/lib/live/config/2700-x2go-getsessions index d87affe..792c6b9 100755 --- a/config/includes.chroot/lib/live/config/2700-x2go-getsessions +++ b/config/includes.chroot/lib/live/config/2700-x2go-getsessions @@ -18,7 +18,7 @@ X2GoGetSessions () #!/bin/bash export TERM=linux; -if [ "\$METHOD" = loopback ]; then +if [ "\$METHOD" = "loopback" ] || [ "\$METHOD" = "none" ]; then exit 0 fi -- Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git