updates for t11 and fsf

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

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index f02f1cf467ecfe96f9e3d8c40043692a35058b69..5c7be4e777a920f327931cab7d82a57050eeb2dd 100755 (executable)
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -1,8 +1,14 @@
 #!/bin/bash
 
+# 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
-    exit 0
+if ifclass VM && ! ifclass demohost || ifclass VOL_BULLSEYE_BOOTSTRAP || [[ ! $FAI_ACTION || $FAI_ACTION = dirinstall ]]; then
+  exit 0
+fi
+
+if ifclass FSF; then
+  exit 0
 fi
 
 keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
@@ -13,32 +19,39 @@ cat <<'EOF'
 $(cat $keyfile)
 EOF
 EOFOUTER
-chmod +x $f
-
-
-f=$target/root/keyscript-manual
-cat >$f  <<'EOF'
-#!/bin/sh
-if ! [ -e /tmp/key ]; then
-    stty -echo
-    read pass
-    printf '%s' "$pass" > /tmp/key
-fi
-cat /tmp/key
-EOF
-chmod +x $f
+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)
+  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
-    mkdir -p $d
-    cp ${files[@]} $d
-    chmod -R o-rwx $d
+  d=$target/q/root/luks
+  mkdir -p $d
+  chmod 700 $d
+  cp -p ${files[@]} $d
+fi
+
+
+#### This bit is duplicated in rootsshsync, except we skip
+#### update-initramfs and add $target
+####
+# We generally shouldn't need this, because we don't ssh in on the 1st
+# reboot since we initially embed the luks key, and with distro-begin,
+# we run rootsshsync around the same time as we remove it. However, it
+# could be helpful in case of problems.
+
+auth_dir=$target/etc/dropbear/initramfs/
+candidate=$(apt-cache policy dropbear-initramfs | awk '$1 == "Candidate:" { print $2 }' | head -n1 ||:)
+if [[ $candidate ]] && dpkg --compare-versions "$candidate" lt 2020.81-4; then
+  auth_dir=$target/etc/dropbear-initramfs
+fi
+auth_file=$auth_dir/authorized_keys
+mkdir -p $auth_dir
+if [[ ! -e $auth_file ]] || ! diff -q /root/.ssh/authorized_keys $auth_file; then
+  cp -p /root/.ssh/authorized_keys $auth_file
 fi