iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dirinstall fixes/improvements, other minor changes
[automated-distro-installer]
/
fai
/
config
/
hooks
/
instsoft.DEFAULT
diff --git
a/fai/config/hooks/instsoft.DEFAULT
b/fai/config/hooks/instsoft.DEFAULT
index b4b3c1028b00ff3890cab3471d81f3107313cf3c..f02f1cf467ecfe96f9e3d8c40043692a35058b69 100755
(executable)
--- a/
fai/config/hooks/instsoft.DEFAULT
+++ b/
fai/config/hooks/instsoft.DEFAULT
@@
-1,7
+1,7
@@
#!/bin/bash
#!/bin/bash
-# exit for any vm
which is not our test vm
-if ifclass VM && ! ifclass demohost; 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
exit 0
fi
@@
-29,6
+29,8
@@
EOF
chmod +x $f
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
if ifclass demohost; then
files=(/var/lib/fai/config/distro-install-common/luks/host-demohost)
elif ifclass tp; then