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 bdb856b467c6fccc896233dfae49b528b3ba6399..11620eb192454be9ba006e154f95e00d5994e032 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -30,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/host-{tp,demohost} $d
+    chmod -R o-rwx $d
 fi