iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various updates
[distro-setup]
/
rootsshsync
diff --git
a/rootsshsync
b/rootsshsync
index a4db227fd511828dc666ff421af0e9308652b93f..c4cebbf5660b56b7c305d184a46dbc826ffb1377 100755
(executable)
--- a/
rootsshsync
+++ b/
rootsshsync
@@
-16,18
+16,23
@@
set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
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=$(id -un)
+if [[ $SUDO_USER ]]; then
+ user=$SUDO_USER
fi
fi
-user_ssh_dir=$(eval echo ~$
{SUDO_USER:-$USER}
)/.ssh
+user_ssh_dir=$(eval echo ~$
user
)/.ssh
# remove broken links, or else rsync has error about them.
find $user_ssh_dir -xtype l -exec rm '{}' \;
# remove broken links, or else rsync has error about them.
find $user_ssh_dir -xtype l -exec rm '{}' \;
@@
-35,10
+40,13
@@
find $user_ssh_dir -xtype l -exec rm '{}' \;
# -L resolve links
rsync -rtL --delete $user_ssh_dir/ $dest
chown -R root:root /root/.ssh
# -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
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
+ mkdir -p
$d/root/.ssh /etc/dropbear-initramfs
chmod 700 $d/root $d/root/.ssh
cp -p /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys
chmod 700 $d/root $d/root/.ssh
cp -p /root/.ssh/authorized_keys $d/root/.ssh/authorized_keys
+ cp -p /root/.ssh/authorized_keys /etc/dropbear-initramfs
update-initramfs -u -k all
fi
update-initramfs -u -k all
fi