[X2Go-Commits] [live-build-x2go] 09/167: more reliable way of determining that IP has been assigned

git-admin at x2go.org git-admin at x2go.org
Sat Nov 18 00:32:33 CET 2017


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

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

commit a8896be7b9cb8a995eeac7761891063922b2c1da
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Fri Jul 21 14:43:04 2017 +0200

    more reliable way of determining that IP has been assigned
---
 config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver  | 2 +-
 config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
index e613d35..614fc40 100755
--- a/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
+++ b/config/includes.chroot/lib/live/config/2150-getsshpubkeysfromserver
@@ -17,7 +17,7 @@ GetSSHPubKeysFromServer ()
 #!/bin/bash
 export TERM=linux;
 
-while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do
+while [ -z "$(hostname -I)" ] ; do
         sleep 2
 done
 
diff --git a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
index 2dd20da..6c892f5 100755
--- a/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
+++ b/config/includes.chroot/lib/live/config/2200-xserver-xorg-getxorgconf
@@ -15,7 +15,7 @@ echo -n " xserver-xorg-getxorgconf"
 #!/bin/bash
 export TERM=linux;
 
-while ! ip a | grep -v "inet 127.0.0.1" | grep -v "inet6 ::1/128" | grep -q inet ; do
+while [ -z "$(hostname -I)" ] ; do
         sleep 2
 done
 if echo "$XORGCONFURL" | grep -q "^tftp://" ; then

--
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