X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=rootsshsync;h=a4db227fd511828dc666ff421af0e9308652b93f;hb=93db0c16393fe75efef3167c1d2b332f50387c23;hp=ebfc80216b6e293e9162e5c2f3ec825048f166ad;hpb=9094b3867bbafb65ad0c99fc4da0da642f83d40d;p=distro-setup

diff --git a/rootsshsync b/rootsshsync
index ebfc802..a4db227 100755
--- a/rootsshsync
+++ b/rootsshsync
@@ -19,13 +19,26 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@"
 
 if test -e /q/root/.ssh; then
-    export LNF_VERBOSE=true
-    if ! /a/exe/lnf /q/root/.ssh /root > /tmp/lnf_log; then
-        cat /tmp/lnf_log
-    fi
+  dest=/q/root/.ssh
+  /a/exe/lnf $dest /root
 else
-    mkdir -p /root/.ssh
-    chmod 700 /root/.ssh
+  dest=/root/.ssh
+  mkdir -p $dest
+  chmod 700 $dest
 fi
-cp -rL $(eval echo ~${SUDO_USER:-$USER})/.ssh/* /root/.ssh
+
+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