various fixes

[distro-setup] / rootsshsync

diff --git a/rootsshsync b/rootsshsync
index 97d2d2f779919413058d70b1ec8282a2a468682e..a4db227fd511828dc666ff421af0e9308652b93f 100755 (executable)
--- a/rootsshsync
+++ b/rootsshsync
@@ -19,12 +19,12 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 if test -e /q/root/.ssh; then
-    dest=/q/root/.ssh
-    /a/exe/lnf $dest /root
+  dest=/q/root/.ssh
+  /a/exe/lnf $dest /root
 else
-    dest=/root/.ssh
-    mkdir -p $dest
-    chmod 700 $dest
+  dest=/root/.ssh
+  mkdir -p $dest
+  chmod 700 $dest
 fi
 
 user_ssh_dir=$(eval echo ~${SUDO_USER:-$USER})/.ssh
@@ -35,3 +35,10 @@ find $user_ssh_dir -xtype l -exec rm '{}' \;
 # -L resolve links
 rsync -rtL --delete $user_ssh_dir/ $dest
 chown -R root:root /root/.ssh
+d=/etc/initramfs-tools
+if [[ -e $d ]] && ! diff -q /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys &>/dev/null; then
+  mkdir -p /etc/initramfs-tools/root/.ssh
+  chmod 700 $d/root $d/root/.ssh
+  cp -p /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys
+  update-initramfs -u -k all
+fi