various improvements and fixes, some flidas related

[distro-setup] / switch-mail-host

diff --git a/switch-mail-host b/switch-mail-host
index ab57c13c012fd3a6a1850180ac6f4ff0fc48eb46..bac21484c89dc93ec67969c330a44377eecc9572 100755 (executable)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -22,7 +22,6 @@ EOF
 ##### begin command line parsing ########
 
 update_wrt=true # default
-long_opt=foo # default
 temp=$(getopt -l help wh "$@") || usage 1
 eval set -- "$temp"
 while true; do
@@ -148,7 +147,7 @@ mail-setup() {
 mail-setup "$old_shell"
 
 sudo dd of=/etc/btrbk.conf <<'EOF'
-ssh_identity /root/.ssh/id_rsa
+ssh_identity /root/.ssh/home
 # Just a guess that local7 is a good facility to pick.
 # It's a bit odd that the transaction log has to be logged to
 # a file or syslog, while other output is sent to std out.
@@ -198,10 +197,10 @@ target send-receive $btrbk_dst
 EOF
 
 
-sudo btrbk --progress run
+sudo btrbk run
 $new_shell mount-latest-subvol
 
-mail-setup
+mail-setup "$new_shell"
 
 if $restore_new_btrbk; then
     $new_shell sudo systemctl start btrbk.timer