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
various fixes, improvements, shellcheck
[automated-distro-installer]
/
fai
/
config
/
hooks
/
instsoft.DEFAULT
diff --git
a/fai/config/hooks/instsoft.DEFAULT
b/fai/config/hooks/instsoft.DEFAULT
index 5c7be4e777a920f327931cab7d82a57050eeb2dd..42f97392c474d02e55baa72817c71fcedd69e875 100755
(executable)
--- 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
# 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_BULLSEYE_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
+if ifclass VM && ! ifclass demohost || ifclass VOL_BULLSEYE_BOOTSTRAP ||
ifclass VOL_BOOKWORM_BOOTSTRAP ||
[[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
exit 0
fi
exit 0
fi
@@
-11,6
+11,11
@@
if ifclass FSF; then
exit 0
fi
exit 0
fi
+fcopy -riB /etc/apt/preferences.d
+# ian: i'm guessing fai does this already
+#fcopy -riB /etc/apt/sources.list.d
+
+
keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
f=$target/root/keyscript
cat > $f <<EOFOUTER
keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
f=$target/root/keyscript
cat > $f <<EOFOUTER