fixes mostly for bootstrap vol, better docs

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index ca8fb6096bff0dd8bc4c7d8102dda78ba348ee07..b8fabac4ac14e42da83fd3f6afc6a83cd44ae8ac 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -16,13 +16,23 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 set -x
 
-# Deploy fai configuration to faiserver,
-# then start a virtual machine to test the config.
+
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
+x="$(readlink -f "$BASH_SOURCE")"; cd ${x%/*}
+
+usage() {
+    cat <<EOF
+usage: ${0##*/} [-h|--help]
+Deploy fai configuration to host "faiserver"
+EOF
+    exit $1
+}
+case $1 in
+    -h|--help) usage ;;
+esac
 
 
 # i use faiserver as a dns alias, but ssh key is associated with
@@ -41,8 +51,13 @@ scp -q ~/.ssh/id_rsa.pub \
 # these files are not exposed.
 s scp -qr /q/root/luks /q/root/shadow \
   root@$faiserver_host:/srv/fai/config/distro-install-common
+
+# should tar ssh all the files, but these ones really justified it
+tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
+  ssh root@$faiserver_host tar -xz -C /srv/fai/config/distro-install-common
 scp -q /a/bin/fai/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
 
+
 # built BELANOS basefile with mk-basefile -J BELENOS64. it's stored in
 # it's own repo which is published alongside this one called
 # fai-basefiles due to being a large binary file.
@@ -65,3 +80,5 @@ chmod -R a+rX /srv/fai/config/distro-install-common
 #u=http://fai-project.org/download/basefiles/XENIAL64.tar.xz
 #wget -nv -N $u
 EOF
+
+faiserver-enable