Merge pull request #425 from Nox996/sync-after-delete

On branch sync-after-delete
sync-after-delete
Axel Burri 2021-11-06 16:30:16 +00:00 committed by GitHub
commit 5a2e89fc62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

4
btrbk
View File

@ -321,6 +321,7 @@ my %backend_cmd_map = (
"btrfs subvolume snapshot" => [ "sudo", "-n", "btrfs", "subvolume", "snapshot" ],
"btrfs subvolume delete" => [ "sudo", "-n", "btrfs", "subvolume", "delete" ],
"btrfs subvolume sync" => [ "sudo", "-n", "btrfs", "subvolume", "sync" ],
"btrfs filesystem sync" => [ "sudo", "-n", "btrfs", "filesystem", "sync" ],
"btrfs send" => [ "sudo", "-n", "btrfs", "send" ],
"btrfs receive" => [ "sudo", "-n", "btrfs", "receive" ],
"btrfs filesystem usage" => [ "sudo", "-n", "btrfs", "filesystem", "usage" ],
@ -1477,6 +1478,9 @@ sub btrfs_subvolume_delete($@)
fatal_stderr => sub { m/^ERROR: /; }, # probably not needed, "btrfs sub delete" returns correct exit status
filter_stderr => \&_btrfs_filter_stderr,
);
$ret = run_cmd(cmd => vinfo_cmd($target, "btrfs filesystem sync", { unsafe => $target->{VINFO_MOUNTPOINT}{PATH} } ),
rsh => vinfo_rsh($target),
);
$ret = run_cmd(cmd => vinfo_cmd($target, "btrfs subvolume sync", { unsafe => $target->{VINFO_MOUNTPOINT}{PATH} }, $target->{node}{id} ),
rsh => vinfo_rsh($target),
);

View File

@ -140,6 +140,8 @@ while [[ "$#" -ge 1 ]]; do
-d|--delete)
allow_cmd "${sudo_prefix}btrfs subvolume delete"
allow_cmd "${sudo_prefix}btrfs subvolume sync"
allow_cmd "${sudo_prefix}btrfs filesystem sync"
;;
-i|--info)