X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEFAULT;h=6d7f4c0222611bfaacd58b4f16b9706525a16fb2;hb=ffc1ca65d70d929126759df4012f5c38265adb7b;hp=ab6e213617f02f65094b554d2f41e4a8da3b2c11;hpb=ce5290b5a6eee95cc59b5c1651d73a224c3d5bbd;p=automated-distro-installer

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index ab6e213..6d7f4c0 100755
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # exit for any vm which is not our test vm
-if ifclass VM && ! ifclass demohost; then
+if ifclass VM && ! ifclass demohost || ifclass VOL_STABLE_BOOTSTRAP; then
     exit 0
 fi
 
@@ -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
@@ -37,9 +29,16 @@ EOF
 chmod +x $f
 
 
-if ifclass tp; then
-    d=$target/root/shadow
+# for hosts which don't have these data volumes, copy the specific
+# files we need.
+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