X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=rootsshsync;h=c55014921b8af67fd2c8d4f3554feb64bfadb218;hb=8452f3f3e0b837ba4e616e062787d726d7888b76;hp=97d2d2f779919413058d70b1ec8282a2a468682e;hpb=eb9b839bb5a91c60cc4f6eb9d7e38ffbf73f0e90;p=distro-setup diff --git a/rootsshsync b/rootsshsync index 97d2d2f..c550149 100755 --- a/rootsshsync +++ b/rootsshsync @@ -16,16 +16,16 @@ set -eE -o pipefail 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 -else - dest=/root/.ssh - mkdir -p $dest - chmod 700 $dest +[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@" + +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 @@ -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