X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=rootsshsync;fp=rootsshsync;h=965bdbe584671c75cff024de3e47c0ee7975ea87;hb=ce4cacd36c5b5babeea85d0f93771017e6169180;hp=a77bf236dc42f49c8604bc93108660223785f167;hpb=b28eebdf9143aa17733f233b30b96f462008f3b6;p=distro-setup

diff --git a/rootsshsync b/rootsshsync
index a77bf23..965bdbe 100755
--- a/rootsshsync
+++ b/rootsshsync
@@ -38,7 +38,7 @@ find $user_ssh_dir -xtype l -exec rm '{}' \;
 # -t times, so it won't rewrite the file every time,
 # -L resolve links
 rsync --exclude=/h --exclude=/h.pub \
- --exclude=/hrsa --exclude=/hrsa.pub \
+      --exclude=/hrsa --exclude=/hrsa.pub \
       --exclude /config --exclude /confighome -rtL --delete $user_ssh_dir/ /root/.ssh
 if [[ -e /q/root/h ]]; then
   cp -a /q/root/{h,hrsa}{,.pub} /root/.ssh
@@ -59,7 +59,7 @@ if [[ -e $user_ssh_dir/config ]]; then
 fi
 chown -R root:root /root/.ssh
 
-rsync -tp --chmod=755 --chown=root:root /a/bin/ds/hssh /usr/local/bin
+rsync -tp --chmod=755 --chown=root:root /a/bin/fai/fai/config/files/usr/local/bin/hssh/IANK /usr/local/bin/hssh
 
 if [[ -e /a/opt/btrbk/ssh_filter_btrbk.sh ]]; then
   install /a/opt/btrbk/ssh_filter_btrbk.sh /usr/local/bin
@@ -69,14 +69,19 @@ if [[ -e /etc/systemd/system/ssh-agent-root.service ]]; then
   systemctl enable --now ssh-agent-root
 fi
 
-d=/etc/initramfs-tools
-if [[ -e $d ]] && ! diff -q /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys &>/dev/null; then
-  mkdir -p $d/root/.ssh /etc/dropbear-initramfs
-  chmod 700 $d/root $d/root/.ssh
-  cp -p /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys
-  cp -p /root/.ssh/authorized_keys /etc/dropbear-initramfs
-  if [[ -e /root/.ssh/authorized_keys2 ]]; then
-    cat /root/.ssh/authorized_keys2 >>/etc/dropbear-initramfs
-  fi
+
+# note: i previously had $auth_dir/root/.ssh/authorized_keys
+# but /usr/share/doc/dropbear-initramfs/README.initramfs
+# says differently. not sure what is up.
+
+auth_dir=/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=/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
   update-initramfs -u -k all
 fi