X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=rootsshsync;h=a4db227fd511828dc666ff421af0e9308652b93f;hb=3174b9cb665b9a7b7ac8413a8e236cd236786632;hp=baf42967acf4e465b0752a46f454d2422550afbc;hpb=98bcf504ce2a56eeb862a59477cfb897a2ef613c;p=distro-setup

diff --git a/rootsshsync b/rootsshsync
index baf4296..a4db227 100755
--- a/rootsshsync
+++ b/rootsshsync
@@ -16,11 +16,29 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-if sudo test -e /q/root/.ssh; then
-    sudo /a/exe/lnf /q/root/.ssh /root
+[[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
+
+if test -e /q/root/.ssh; then
+  dest=/q/root/.ssh
+  /a/exe/lnf $dest /root
 else
-    sudo mkdir -p /root/.ssh
-    sudo chmod 700 /root/.ssh
+  dest=/root/.ssh
+  mkdir -p $dest
+  chmod 700 $dest
+fi
+
+user_ssh_dir=$(eval echo ~${SUDO_USER:-$USER})/.ssh
+
+# remove broken links, or else rsync has error about them.
+find $user_ssh_dir -xtype l -exec rm '{}' \;
+# -t times, so it won't rewrite the file every time,
+# -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
-sudo cp -rL $(eval echo ~${SUDO_USER:-$USER})/.ssh/* /root/.ssh
-sudo chown -R root:root /root/.ssh