updated btrfs send/recv code; script to put layered seed on iso

1 files changed, 3 insertions, 1 deletions

diff --git a/btrfs-send-root.sh b/btrfs-send-root.sh
index 6152db8..25e60f2 100644
--- a/btrfs-send-root.sh
+++ b/btrfs-send-root.sh
@@ -10,7 +10,8 @@ rootfs_uuid ()
 remote_btrfs_receiver()
 {
 #   ssh "$BTRFS_RECEIVE_DESTINATION_HOST" -- "sudo btrfs receive $(shellescape "$BTRFS_RECEIVE_DESTINATION_PATH")"
-    ssh "$BTRFS_RECEIVE_DESTINATION_HOST" -- "sudo sh sami/btrfs-receive-root.sh"
+    ssh "$BTRFS_RECEIVE_DESTINATION_HOST" -- \
+        "sudo sh sami/btrfs-receive-root.sh $(shellescape "$BTRFS_RECEIVE_DESTINATION_PATH") $(shellescape "$BTRFS_RECEIVE_SUBVOLUME_NAME")"
 }
 
 dummy_receiver()
@@ -32,6 +33,7 @@ push_remote()
     esac
     local BTRFS_RECEIVE_DESTINATION_PATH="${ssh_dst#*:}"
     local BTRFS_RECEIVE_DESTINATION_HOST="${ssh_dst%%:*}"
+    local BTRFS_RECEIVE_SUBVOLUME_NAME="${snap_dir#$mnt/}"
     push_helper false "$snap_dir" "$prev_dir" "$src" remote_btrfs_receiver
 }