X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=rootsshsync;h=90928c669d922f72abc55562d5d7a1e943def725;hb=648257b1698602fdeeb7eb5ba496106547f93665;hp=baf42967acf4e465b0752a46f454d2422550afbc;hpb=98bcf504ce2a56eeb862a59477cfb897a2ef613c;p=distro-setup diff --git a/rootsshsync b/rootsshsync index baf4296..90928c6 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 -else - sudo mkdir -p /root/.ssh - sudo chmod 700 /root/.ssh +[[ $EUID == 0 ]] || exec sudo "$BASH_SOURCE" "$@" + +dest=/root/.ssh + +# leftover +if [[ -L $dest ]]; then + rm $dest +fi +mkdir -p $dest +chmod 700 $dest + +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