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

btrbk: bugfix: allow relative path for subvolume; adapted documentation

pull/30/head
Axel Burri 2015-04-28 19:08:20 +02:00
parent fb912da448
commit 436b1361ff
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
btrbk
View File

@ -424,10 +424,6 @@ sub parse_config(@)
return undef unless(check_file($value, { relative => 1 }, $key, $file)); return undef unless(check_file($value, { relative => 1 }, $key, $file));
$value =~ s/\/+$//; # remove trailing slash $value =~ s/\/+$//; # remove trailing slash
$value =~ s/^\/+//; # remove leading slash $value =~ s/^\/+//; # remove leading slash
if($value =~ /\//) {
ERROR "Subvolume contains slashes: \"$value\" in \"$file\" line $.";
return undef;
}
TRACE "config: adding subvolume \"$value\" to volume context: $cur->{url}"; TRACE "config: adding subvolume \"$value\" to volume context: $cur->{url}";
my $subvolume = { CONTEXT => "subvolume", my $subvolume = { CONTEXT => "subvolume",

12
doc/btrbk.conf.5
View File

@ -19,9 +19,10 @@ global options must be set before any sections are defined.
The sections are: The sections are:
.TP .TP
\fBvolume\fR <volume-directory>|<url> \fBvolume\fR <volume-directory>|<url>
Directory of a btrfs volume (or subvolume) containing the source Directory of a btrfs volume containing the source subvolume(s) to be
subvolume(s) to be backuped (usually the mount-point of a btrfs backuped. \fI<volume-directory>\fR must be an absolute path and point
filesystem mounted with the \fIsubvolid=0\fR option). to a btrfs volume (or subvolume). Usually the mount point of a btrfs
filesystem mounted with the \fIsubvolid=0\fR option.
.TP .TP
\fBsubvolume\fR <subvolume-name> \fBsubvolume\fR <subvolume-name>
Subvolume to be backuped, relative to the \fI<volume-directory>\fR Subvolume to be backuped, relative to the \fI<volume-directory>\fR
@ -29,8 +30,9 @@ specified in the \fIvolume\fR section.
.TP .TP
\fBtarget\fR <type> <volume-directory>|<url> \fBtarget\fR <type> <volume-directory>|<url>
Target type and directory where the backup subvolumes are to be Target type and directory where the backup subvolumes are to be
created. In the current version of btrbk, the only valid \fI<type>\fR created. \fI<volume-directory>\fR must be an absolute path and point
is \(lqsend\-receive\(rq. to a btrfs volume (or subvolume). Currently the the only valid
\fI<type>\fR is \(lqsend\-receive\(rq.
.PP .PP
For the \fIvolume\fR and \fItarget\fR sections, you can also specify a For the \fIvolume\fR and \fItarget\fR sections, you can also specify a
ssh-url instead of a local directory. The syntax for \fI<url>\fR is: ssh-url instead of a local directory. The syntax for \fI<url>\fR is: