X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEFAULT;h=f02f1cf467ecfe96f9e3d8c40043692a35058b69;hb=ac4e0089e245c96a388b8fcdd92fc05da3399694;hp=de477663758f4fc567be5d2792cdab3685df0d5d;hpb=ec9227898fa68bd89de454c87bce8ea051a8d783;p=automated-distro-installer diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT index de47766..f02f1cf 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 || ifclass STABLE_BOOTSTRAP; then +# exit for any vm except demohost, or if we are doing a dirinstall +if ifclass VM && ! ifclass demohost || ifclass VOL_STRETCH_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then exit 0 fi @@ -29,6 +29,8 @@ EOF chmod +x $f +# 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