[X2Go-Commits] [live-build-x2go] 48/160: if-up scripts should exit with a NOP when a local network device is changing to up, rather than a real network device

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 01:55:38 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit e6adc05a3618e66d85109a3cd2c974b0eb1439cb
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Jul 23 22:35:51 2017 +0200

    if-up scripts should exit with a NOP when a local network device is changing to up, rather than a real network device
---
 config/includes.chroot/lib/live/config/2050-settime                  | 4 ++++
 config/includes.chroot/lib/live/config/2100-showifconfig             | 4 ++++
 config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver  | 4 ++++
 config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf | 4 ++++
 config/includes.chroot/lib/live/config/2700-x2go-getsessions         | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/config/includes.chroot/lib/live/config/2050-settime b/config/includes.chroot/lib/live/config/2050-settime
index b5c17e3..dc062cd 100755
--- a/config/includes.chroot/lib/live/config/2050-settime
+++ b/config/includes.chroot/lib/live/config/2050-settime
@@ -11,6 +11,10 @@ cat >/etc/network/if-up.d/0050-settime <<SETTIME
 #!/bin/bash
 export TERM=linux;
 
+if [ "$METHOD" = loopback ]; then
+        exit 0
+fi
+
 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 81a1276..afa8722 100755
--- a/config/includes.chroot/lib/live/config/2100-showifconfig
+++ b/config/includes.chroot/lib/live/config/2100-showifconfig
@@ -14,6 +14,10 @@ cat >/etc/network/if-up.d/0100-showips <<SHOWIPS
 #!/bin/bash
 export TERM=linux;
 
+if [ "$METHOD" = loopback ]; then
+        exit 0
+fi
+
 while [ -z "\$(hostname -I)" ] ; do
 	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty8
 	sleep 2
diff --git a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
index d96284d..4749db2 100755
--- a/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2250-getsshpubkeysfromserver
@@ -17,6 +17,10 @@ GetSSHPubKeysFromServer ()
 #!/bin/bash
 export TERM=linux;
 
+if [ "$METHOD" = loopback ]; then
+        exit 0
+fi
+
 while [ -z "\$(hostname -I)" ] ; do
 	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty8
 	sleep 2
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 3996e85..eb14799 100755
--- a/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf
+++ b/config/includes.chroot/lib/live/config/2300-xserver-xorg-getxorgconf
@@ -15,6 +15,10 @@ echo -n " xserver-xorg-getxorgconf"
 #!/bin/bash
 export TERM=linux;
 
+if [ "$METHOD" = loopback ]; then
+        exit 0
+fi
+
 while [ -z "\$(hostname -I)" ] ; do
 	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty8
 	sleep 2
diff --git a/config/includes.chroot/lib/live/config/2700-x2go-getsessions b/config/includes.chroot/lib/live/config/2700-x2go-getsessions
index 2ee6792..bd59a57 100755
--- a/config/includes.chroot/lib/live/config/2700-x2go-getsessions
+++ b/config/includes.chroot/lib/live/config/2700-x2go-getsessions
@@ -18,6 +18,10 @@ X2GoGetSessions ()
 #!/bin/bash
 export TERM=linux;
 
+if [ "$METHOD" = loopback ]; then
+        exit 0
+fi
+
 while [ -z "\$(hostname -I)" ] ; do
 	echo -en "\n\$(date +'%F | %T | ')'\$0' is waiting for a client IP." | tee -a /dev/tty8
 	sleep 2

--
Alioth's /srv/git/code.x2go.org/live-build-x2go.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git


More information about the x2go-commits mailing list