From 7def49bda215027a6ead2a661b68a5296f6b4eb6 Mon Sep 17 00:00:00 2001
From: Ian Kelling <ian@iankelling.org>
Date: Fri, 21 Aug 2020 09:49:18 -0400
Subject: [PATCH] ipv6 btrbk

---
 btrbk-run           | 15 +++++++++++++--
 distro-begin        |  3 ++-
 mount-latest-remote |  6 +++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/btrbk-run b/btrbk-run
index a83e21d..00052da 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -99,7 +99,14 @@ while true; do
     --pull-reexec) pull_reexec=true; shift ;;
     -q) verbose=false; verbose_arg=; progress_arg=; shift ;;
     # source host to receive a backup from
-    -s) source=$2; shift 2 ;;
+    -s)
+      source=$2
+      bbksource=$source
+      if [[ $source == *:* ]]; then
+        bbksource="[$source]"
+      fi
+      shift 2
+      ;;
     # target hosts to send to. empty is valid for just doing local
     # snapshot. we have default hosts we will populate.
     -t) IFS=, targets=($2); unset IFS; shift 2 ;;
@@ -384,7 +391,7 @@ for m in ${mountpoints[@]}; do
   sub=${m#/}
   if [[ $source ]]; then
     cat >>/etc/btrbk.conf <<EOF
-volume ssh://$source$vol
+volume ssh://$bbksource$vol
 subvolume $sub
 target send-receive $vol/btrbk
 EOF
@@ -394,6 +401,10 @@ volume $vol
 subvolume $sub
 EOF
     for tg in ${targets[@]}; do
+      # handle ipv6
+      if [[ $tg == *:* ]]; then
+        tg="[$tg]"
+      fi
       cat >>/etc/btrbk.conf <<EOF
 target send-receive ssh://$tg$vol/btrbk
 EOF
diff --git a/distro-begin b/distro-begin
index 0c0dac0..63f01f7 100755
--- a/distro-begin
+++ b/distro-begin
@@ -406,7 +406,8 @@ fi
 ##### make extra dirs
 dirs=(/mnt/{1,2,3,4,5,6,7,8,9} /nocow/t)
 sudo mkdir -p "${dirs[@]}"
-sudo chown $USER:$USER  "${dirs[@]}"
+# allow to fail because they could have read-only mounts on them
+sudo chown $USER:$USER  "${dirs[@]}" ||:
 
 ###### setup /i
 if home_network; then
diff --git a/mount-latest-remote b/mount-latest-remote
index 2d17f1e..3e36009 100755
--- a/mount-latest-remote
+++ b/mount-latest-remote
@@ -27,7 +27,11 @@ $script_dir/install-my-scripts
 cd /usr/local
 
 for tg; do
-  rsync -RtO bin/{mount-latest-subvol,check-subvol-stale} lib/err root@$tg:/usr/local
+  rsynctg=$tg
+  if [[ $tg == *:* ]]; then
+    rsynctg="[$tg]"
+  fi
+  rsync -RtO bin/{mount-latest-subvol,check-subvol-stale} lib/err "root@$rsynctg:/usr/local"
   ssh root@$tg bash <<'EOF'
 set -e
 chmod +x /usr/local/bin/{mount-latest-subvol,check-subvol-stale}
-- 
2.30.2