Merge pull request crowbar#2344 from bmwiedemann/bsc985556

sledgehammer: wait for network (bsc#985556)

Author: bmwiedemann

sledgehammer/start-up.sh

@@ -150,8 +150,13 @@ echo "*.* @@${ADMIN_IP}" >> /etc/rsyslog.conf
 service $RSYSLOGSERVICE restart
 
 # Sometimes at this point network is not up yet, wait for it
-echo "Waiting for admin server ($ADMIN_IP) to be reachable; will wait up to 60 seconds..."
-ping -c 1 -w 60 $ADMIN_IP > /dev/null || {
+n=60
+echo "Waiting for admin server ($ADMIN_IP) to be reachable; will wait up to $n seconds..."
+while (( $n > 0 )) && ! ping -q -c 1 -w 1 $ADMIN_IP > /dev/null ; do
+    sleep 1
+    let n--
+done
+(( $n > 0 )) || {
     echo "Admin server ($ADMIN_IP) not reachable."
     echo "Things will end badly."
 }