add copyright, fix arch

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index aa10dfc8eeb18bc9b3f04f9067c4c43ee4736605..b3e2dec00e9de641d0bd9b676ef265e3f6fff930 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -1,7 +1,24 @@
 #!/bin/bash -l
+# Copyright (C) 2016 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 set -x
 
-# Assumes pxe config for dhcp has been setup.
+# Note, sometimes shutting down the existing demohost vm
+# fails. Just run again if that happens.
+
 # Deploy fai configuration to faiserver,
 # then start a virtual machine to test the config.
 
@@ -82,6 +99,6 @@ fi
 
 
 if is_arch_revm; then
-    while ! timeout 10 ssh $name /bin/true; do sleep 1; done
+    while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 1; done
     ./arch-init-remote $name
 fi