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 bdb856b467c6fccc896233dfae49b528b3ba6399..b4b3c1028b00ff3890cab3471d81f3107313cf3c 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -29,9 +29,14 @@ EOF
 chmod +x $f
 
 
-if ifclass tp; then
-    d=$target/root/shadow
+if ifclass demohost; then
+    files=(/var/lib/fai/config/distro-install-common/luks/host-demohost)
+elif ifclass tp; then
+    files=(/var/lib/fai/config/distro-install-common/luks/host-{tp,demohost})
+fi
+if [[ ${files[0]}  ]]; then
+    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 ${files[@]} $d
+    chmod -R o-rwx $d
 fi