ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: snapshot_name defaults to volume name if subvolume name is "."

pull/245/head
Axel Burri 2018-07-07 16:23:09 +02:00
parent 7088a91fa3
commit d15133b3d4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
btrbk
View File

@ -3433,16 +3433,18 @@ sub parse_config_line($$$$$)
my $rel_path = check_file($value, { relative => 1, wildcards => 1 }, sanitize => 1, error_statement => "for option \"$key\" in \"$file\" line $."); my $rel_path = check_file($value, { relative => 1, wildcards => 1 }, sanitize => 1, error_statement => "for option \"$key\" in \"$file\" line $.");
return undef unless(defined($rel_path)); return undef unless(defined($rel_path));
# snapshot_name defaults to subvolume name (or volume name if subvolume=".")
my $default_snapshot_name = ($rel_path eq '.') ? $cur->{url} : $rel_path;
$default_snapshot_name =~ s/^.*\///;
$default_snapshot_name = 'ROOT' if($default_snapshot_name eq ""); # if volume="/"
TRACE "config: adding subvolume \"$rel_path\" to volume context: $cur->{url}"; TRACE "config: adding subvolume \"$rel_path\" to volume context: $cur->{url}";
my $snapshot_name = $rel_path;
$snapshot_name =~ s/^.*\///; # snapshot_name defaults to subvolume name
die unless($cur->{CONTEXT} eq "volume");
my $subvolume = { CONTEXT => "subvolume", my $subvolume = { CONTEXT => "subvolume",
PARENT => $cur, PARENT => $cur,
# SUBSECTION => [], # handled by target propagation # SUBSECTION => [], # handled by target propagation
rel_path => $rel_path, rel_path => $rel_path,
url => $cur->{url} . '/' . $rel_path, url => $cur->{url} . '/' . $rel_path,
snapshot_name => $snapshot_name, # computed default to subvolume name (c_default) snapshot_name => $default_snapshot_name, # computed default (c_default)
}; };
$subvolume->{GLOB_CONTEXT} = 1 if($value =~ /\*/); $subvolume->{GLOB_CONTEXT} = 1 if($value =~ /\*/);
push(@{$cur->{SUBSECTION}}, $subvolume); push(@{$cur->{SUBSECTION}}, $subvolume);