check for sshd running, not only if the host pings

diff --git a/liveboot_testdeploy.sh b/liveboot_testdeploy.sh
index a96e51e02ba0e361a30ffe49138828cfeb46b803..0b3e0c6da8f0515c3bc3021bdc97b311428e521b 100755 (executable)
--- a/liveboot_testdeploy.sh
+++ b/liveboot_testdeploy.sh
@@ -64,19 +64,19 @@ cat $TESTSERVER_MGMT_PASSWD_FILE | ipmitool -H $TESTSERVER_MGMT_IP  -U ADMIN -a
 sleep 3
 if $(ping -c 1 $TESTSERVER >/dev/null)  ; then
        figlet "Warning:"
-       echo "$TESTSERVER responds to pings, even though it was reseted 3secs ago, this should not happen, please investigate manually."
+       echo "$TESTSERVER responds to pings, even though it was reset 3secs ago, this should not happen, please investigate manually."
        exit 1
 fi
 
 #
-# check for 10min whether it's up again
+# check for 10min whether it's booting up again
 #
 echo "Pinging $TESTSERVER..."
 for i in $(seq 1 60) ; do
        sleep 10
        echo "."
        if $(ping -c 1 $TESTSERVER >/dev/null)  ; then
-               echo "$TESTSERVER pings again, so we assume it's up."
+               echo "$TESTSERVER pings again, so we assume it's booting now."
                break
        fi
 done
@@ -86,6 +86,29 @@ if ! $(ping -c 1 $TESTSERVER >/dev/null) ; then
        exit 1
 fi
 
+#
+# check for 15min whether ssh comes back
+#
+echo "Checking for sshd running on $TESTSERVER..."
+for i in $(seq 1 90) ; do
+       sleep 10
+       if $(ping -c 1 $TESTSERVER >/dev/null)  ; then
+               echo -n "ping $TESTSERVER ok..."
+               # check ssh FIXME
+               if $(nc -z $TESTSERVER 22 ) ; then
+                       echo "ok, sshd is running."
+                       break
+               else
+                       echo "but sshd is not running."
+               fi
+       fi
+done
+if ! $(nc -z $TESTSERVER 22 ) ; then
+       figlet "Failure:"
+       echo "$TESTSERVER still not running sshd, please investigate."
+       exit 1
+fi
+
 #
 # send announce mail
 #
@@ -95,7 +118,10 @@ if [ ! -e $MAIL ] ; then
        echo "$MAIL does not exist, something wrong with liveboot-web?"
        exit 1
 fi
-cat $MAIL | /usr/sbin/sendmail $MAILTO && echo "Ok, mail to $MAILTO send."
+cat $MAIL
+cat $MAIL | /usr/sbin/sendmail $MAILTO
+echo
+echo "Ok, mail to $MAILTO send."
 
 #
 # finish