X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEFAULT;h=bdcaab13fe2b39ee1831c1b72dd2991dbbddff9e;hp=f02f1cf467ecfe96f9e3d8c40043692a35058b69;hb=ee37d990c89bb3bab1b54e3b3fb43e9f79ed039b;hpb=45578de750fb07f7a7f64181e6b3b749ef727725

diff --git a/fai/config/hooks/instsoft.DEFAULT b/fai/config/hooks/instsoft.DEFAULT
index f02f1cf..bdcaab1 100755
--- a/fai/config/hooks/instsoft.DEFAULT
+++ b/fai/config/hooks/instsoft.DEFAULT
@@ -1,8 +1,10 @@
 #!/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
+  exit 0
 fi
 
 keyfile=/var/lib/fai/config/distro-install-common/luks/host-$HOSTNAME
@@ -13,32 +15,30 @@ 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,demohost})
 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
+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