main fai scripts can run outside of fai, fixup stuff

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

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index ab6e213617f02f65094b554d2f41e4a8da3b2c11..3eda00ee9d6a57873c2cce167729eaefc28cc4c2 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -16,14 +16,6 @@ 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
@@ -38,8 +30,13 @@ 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
+    # 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
+    cp /var/lib/fai/config/distro-install-common/luks/host-{tp,demohost} $d
+    chmod -R o-rwx $d
 fi