scrap mdadm, various fixes

[automated-distro-installer] / fai / config / hooks / instsoft.DEFAULT

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index 1879648b73a71afd0d705ce2efe78c55c2be67cb..ab6e213617f02f65094b554d2f41e4a8da3b2c11 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -5,19 +5,41 @@ if ifclass VM && ! ifclass demohost; then
     exit 0
 fi
 
+keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
 f=$target/root/keyscript
 cat > $f <<EOFOUTER
 #!/bin/sh
 cat <<'EOF'
-$(cat /var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME)
+$(cat $keyfile)
 EOF
 EOFOUTER
+chmod +x $f
+
+
+crypt_dev=(/dev/mapper/crypt_dev_?da3)
+crypt_dev=${crypt_dev[0]}
+crypt_name=${crypt_dev##/dev/mapper/}
+dev=(/dev/?da3)
+dev=${dev[0]}
+
+dd if=$keyfile of=$crypt_dev
 
+f=$target/root/keyscript-manual
+cat >$f  <<'EOF'
+#!/bin/sh
+if ! [ -e /tmp/key ]; then
+    stty -echo
+    read pass
+    printf '%s' "$pass" > /tmp/key
+fi
+cat /tmp/key
+EOF
 chmod +x $f
 
+
 if ifclass tp; then
     d=$target/root/shadow
     mkdir -p $d
     ls -la /var/lib/fai/config/distro-install-common
-    cp /var/lib/fai/config/distro-install-common/traci{-simple} $d
+    cp /var/lib/fai/config/distro-install-common/traci{,-simple} $d
 fi