Skip to content

Add option to prefix the full subvolume path in snapshot_name #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LubosKolouch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add option to prefix the full subvolume path in snapshot_name #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions btrbk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ my %config_options = (
timestamp_format => { default => "short", accept => [ "short", "long", "long-iso" ], context => [ "global", "volume", "subvolume" ] },
snapshot_dir => { default => undef, accept_file => { relative => 1 }, context => [ "global", "volume", "subvolume" ] },
snapshot_name => { c_default => 1, accept_file => { name_only => 1 }, context => [ "subvolume" ], deny_glob_context => 1 }, # NOTE: defaults to the subvolume name (hardcoded)
snapshot_name_prefix_fullpath => { default => "no", accept => ["yes", "no" ] },
snapshot_create => { default => "always", accept => [ "no", "always", "ondemand", "onchange" ], context => [ "global", "volume", "subvolume" ] },
incremental => { default => "yes", accept => [ "yes", "no", "strict" ] },
incremental_clones => { default => 0, accept_numeric => 1 },
Expand Down Expand Up @@ -6612,6 +6613,12 @@ MAIN:
my $postfix_counter = $lookup[0] // -1;
$postfix_counter++;
my $snapshot_name = $snapshot_basename . '.' . $timestamp . ($postfix_counter ? "_$postfix_counter" : "");
if ( config_key($svol, "snapshot_name_prefix_fullpath") eq "yes" ) {
my $sanitized_snaproot = $snaproot->{PATH};
# replace all /s with _ in the root
$sanitized_snaproot =~ s/\//_/msxg;
$snapshot_name = $sanitized_snaproot.$snapshot_name;
}

if(@unconfirmed_target_name) {
INFO "Assuming non-present subvolume \"$snapshot_name\" in skipped targets: " . join(", ", map { "\"$_->{PRINT}\"" } @unconfirmed_target_name);
Expand Down
4 changes: 4 additions & 0 deletions btrbk.conf.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ snapshot_dir _btrbk_snap
# disk when btrbk terminates.
#btrfs_commit_delete no

# Include full path in the snapshot name to distinguish between snapshots
# with the same name, but different roots
# snapshot_name_prefix_fullpath yes


#
# Volume section: "volume <volume-directory>"
Expand Down