use disk/by-id if possibe, other small 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..11620eb192454be9ba006e154f95e00d5994e032 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -5,19 +5,38 @@ 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
+
 
+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
+    d=$target/q/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
+    chmod -R o-rwx $d
+    d=$target/q/root/luks
     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/host-{tp,demohost} $d
+    chmod -R o-rwx $d
 fi