update to bullseye

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

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index d2a8f760244d1399caf0c662c858a71f26fa7e86..2d0c9058c9b8c2b52f5751e8e9c5159ecc08e1e5 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -1,16 +1,44 @@
 #!/bin/bash
 
-# exit for any vm which is not our test vm
-if ifclass VM && ! ifclass demohost; then
-    exit 0
+# 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
+  exit 0
 fi
 
+keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
 f=$target/root/keyscript
 cat > $f <<EOFOUTER
 #!/bin/sh
 cat <<'EOF'
-$(cat /var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME)
+$(cat $keyfile)
 EOF
 EOFOUTER
+chmod 700 $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
+  files=(/var/lib/fai/config/distro-install-common/luks/host-tp)
+fi
+if [[ ${files[0]}  ]]; then
+  d=$target/q/root/luks
+  mkdir -p $d
+  chmod 700 $d
+  cp -p ${files[@]} $d
+fi
+
 
-chmod +x $f
+#### this bit is duplicated in rootsshsync
+f=/var/lib/fai/config/files/root/.ssh/authorized_keys/STANDARD
+d=$target/etc/initramfs-tools
+d2=$target/etc/dropbear-initramfs
+mkdir -p $d/root/.ssh $d2
+chmod 700 $d/root $d/root/.ssh
+# i think buster uses the second, flidas uses the first.
+cp -p $f $d/root/.ssh/authorized_keys
+cp -p $f $d2/authorized_keys