various fixes and initial focal support

[automated-distro-installer] / fai / config / hooks / instsoft.DEFAULT

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index bdcaab13fe2b39ee1831c1b72dd2991dbbddff9e..8e9c7e579a915d9d59958cf5e49efe4d6ac18d4c 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -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