Commit 056143e2 authored by Mike Hibler's avatar Mike Hibler

Sync with FreeBSD versions.

parent 0dab19fe
......@@ -731,12 +731,13 @@ rm -f /tmp/loadinfo.out /tmp/secureloadinfo.out
# some reason.
#
if [ $reboot -eq 1 ]; then
$BINDIR/tmcc state RELOADDONEV2
echo "Waiting for server to reboot us ..."
sleep 1
$BINDIR/tmcc state RELOADDONEV2
if [ $IS_REMOTE -eq 1 ]; then
sleep 30
else
sleep 240
sleep 300
fi
echo "No response from server, rebooting myself ..."
/sbin/reboot
......
......@@ -413,7 +413,7 @@ dofixsshd() {
else
echo " updating /etc/ssh/sshd_config"
sed -i .preemulab \
sed -i \
-e '/^Protocol /d' \
-e '/^PasswordAuthentication /d' \
-e '/^ChallengeResponseAuthentication /d' \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment