X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEFAULT;h=2d0c9058c9b8c2b52f5751e8e9c5159ecc08e1e5;hb=f67d4b719356595b424aa3cd358abc79426583c5;hp=bdcaab13fe2b39ee1831c1b72dd2991dbbddff9e;hpb=ed3681256885d295f39d5df60784d3281a2f8719;p=automated-distro-installer

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index bdcaab1..2d0c905 100755
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -3,7 +3,7 @@
 # These are things we can do before package_config packages get installed.
 
 # 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
+if ifclass VM && ! ifclass demohost || ifclass VOL_BULLSEYE_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
   exit 0
 fi
 
@@ -23,7 +23,7 @@ chmod 700 $f
 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})
+  files=(/var/lib/fai/config/distro-install-common/luks/host-tp)
 fi
 if [[ ${files[0]}  ]]; then
   d=$target/q/root/luks