various fixes

[distro-setup] / rootsshsync

diff --git a/rootsshsync b/rootsshsync
index b4335dbcbbccfdb9164e44b4762dffcbba089268..fa36a563898ea2ca6b100acb4f0fc85cb705e660 100755 (executable)
--- a/rootsshsync
+++ b/rootsshsync
@@ -37,9 +37,11 @@ fi
 find $user_ssh_dir -xtype l -exec rm '{}' \;
 # -t times, so it won't rewrite the file every time,
 # -L resolve links
-rsync --exclude=/h --exclude=/h.pub --exclude /config --exclude /confighome -rtL --delete $user_ssh_dir/ /root/.ssh
+rsync --exclude=/h --exclude=/h.pub \
+ --exclude=/hrsa --exclude=/hrsa.pub \
+      --exclude /config --exclude /confighome -rtL --delete $user_ssh_dir/ /root/.ssh
 if [[ -e /q/root/h ]]; then
-  cp -a /q/root/h{,.pub} /root/.ssh
+  cp -a /q/root/{h,hrsa}{,.pub} /root/.ssh
 fi
 
 if [[ -e $user_ssh_dir/config ]]; then
@@ -57,8 +59,8 @@ if [[ -e $user_ssh_dir/config ]]; then
 fi
 chown -R root:root /root/.ssh
 
-# notably: installs hssh
-/a/exe/install-my-scripts
+rsync -t --chmod=755 --chown=root:root /b/ds/hssh /usr/local/bin
+
 if [[ -e /a/opt/btrbk/ssh_filter_btrbk.sh ]]; then
   install /a/opt/btrbk/ssh_filter_btrbk.sh /usr/local/bin
 fi