X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEFAULT;h=de477663758f4fc567be5d2792cdab3685df0d5d;hb=cfe7d2a4eb0e0af4cd59df420f76ea4d5ee755fd;hp=3eda00ee9d6a57873c2cce167729eaefc28cc4c2;hpb=d3d495af167adba91b190e8dcb95649c34fa04c7;p=automated-distro-installer diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT index 3eda00e..de47766 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 STABLE_BOOTSTRAP; then exit 0 fi @@ -29,14 +29,14 @@ EOF chmod +x $f -if ifclass tp; then - 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 +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 - cp /var/lib/fai/config/distro-install-common/luks/host-{tp,demohost} $d + cp ${files[@]} $d chmod -R o-rwx $d fi