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 fixes, mostly for etiona
[distro-setup]
/
rootsshsync
diff --git
a/rootsshsync
b/rootsshsync
index c55014921b8af67fd2c8d4f3554feb64bfadb218..668f8a3d7ed931ea2a65130c050b9c7e9326ca66 100755
(executable)
--- a/
rootsshsync
+++ b/
rootsshsync
@@
-27,7
+27,16
@@
fi
mkdir -p $dest
chmod 700 $dest
mkdir -p $dest
chmod 700 $dest
-user_ssh_dir=$(eval echo ~${SUDO_USER:-$USER})/.ssh
+user=$(id -un)
+if [[ $SUDO_USER ]]; then
+ user=$SUDO_USER
+fi
+
+user_ssh_dir=$(eval echo ~$user)/.ssh
+if [[ ! -s $user_ssh_dir/authorized_keys ]]; then
+ echo missing $user_ssh_dir/authorized_keys. bad sign. bailing >&2
+ exit 1
+fi
# 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
+44,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