From 34ed3df8b210461ae217424c089d917fb300a824 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Fri, 22 Apr 2016 22:44:21 -0400 Subject: fix btrfs receive script to properly set up seed subvolumes --- btrfs-receive-root.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/btrfs-receive-root.sh b/btrfs-receive-root.sh index 175dd49..62504bf 100644 --- a/btrfs-receive-root.sh +++ b/btrfs-receive-root.sh @@ -22,9 +22,14 @@ create_layer_filesystem() finish() { - btrfs_replace_default_subvolume_with "$mountpoint"/"$receive_subv" && - umount "$mountpoint" && - sex btrfstune -S1 "$layer_file" && + local subv_id + mv "$mountpoint"/ROOT "$mountpoint"/ROOT.old || return + btrfs subvolume snapshot "$mountpoint"/"$receive_subv" "$mountpoint"/ROOT || return + subv_id=$(btrfs_show_subvolume_id "$mountpoint"/ROOT) || return + btrfs subvolume set-default "$subv_id" "$mountpoint" || return + btrfs subvolume delete "$mountpoint"/ROOT.old || return + umount "$mountpoint" || return + sex btrfstune -S1 "$layer_file" || return losetup -d "$layer_dev" } -- cgit v1.2.3