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

Merge 77445718a7 into d8e8df0ebd

pull/44/merge
Jan Wagner 2015-08-31 23:30:35 +00:00
parent d8e8df0ebd 77445718a7
commit 549584b183
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
btrbk
View File

@ -76,6 +76,7 @@ my %config_options = (
ssh_identity => { default => undef, accept_file => { absolute => 1 } }, ssh_identity => { default => undef, accept_file => { absolute => 1 } },
ssh_user => { default => "root", accept_regexp => qr/^[a-z_][a-z0-9_-]*$/ }, ssh_user => { default => "root", accept_regexp => qr/^[a-z_][a-z0-9_-]*$/ },
ssh_port => { default => "default", accept => [ "default" ], accept_numeric => 1 }, ssh_port => { default => "default", accept => [ "default" ], accept_numeric => 1 },
ssh_compression => { default => "yes", accept => [ "yes", "no" ] },
btrfs_progs_compat => { default => undef, accept => [ "yes", "no" ] }, btrfs_progs_compat => { default => undef, accept => [ "yes", "no" ] },
# deprecated options # deprecated options
@ -234,8 +235,10 @@ sub vinfo($$)
my $ssh_port = config_key($config, "ssh_port"); my $ssh_port = config_key($config, "ssh_port");
my $ssh_user = config_key($config, "ssh_user"); my $ssh_user = config_key($config, "ssh_user");
my $ssh_identity = config_key($config, "ssh_identity"); my $ssh_identity = config_key($config, "ssh_identity");
my $ssh_compression = config_key($config, "ssh_compression");
my @ssh_options; my @ssh_options;
push(@ssh_options, '-p', $ssh_port) if($ssh_port ne "default"); push(@ssh_options, '-p', $ssh_port) if($ssh_port ne "default");
push(@ssh_options, '-C') if($ssh_compression eq "yes");
if($ssh_identity) { if($ssh_identity) {
push(@ssh_options, '-i', $ssh_identity); push(@ssh_options, '-i', $ssh_identity);
} else { } else {

3
doc/btrbk.conf.5
View File

@ -120,6 +120,9 @@ have to make sure that the remote user is able to run /sbin/btrfs
Port to connect to on the remote host. Defaults to \[lq]default\[rq] Port to connect to on the remote host. Defaults to \[lq]default\[rq]
(the port specified in \fIssh_config\fR, which defaults to 22). (the port specified in \fIssh_config\fR, which defaults to 22).
.TP .TP
\fBssh_compression\fR yes|no
Enables or disables the compression of SSH (-C flag). Defaults to yes.
.TP
\fBbtrfs_commit_delete\fR after|each|no \fBbtrfs_commit_delete\fR after|each|no
If set, make sure the deletion of snapshot and backup subvolumes are If set, make sure the deletion of snapshot and backup subvolumes are
committed to disk when btrbk terminates. Defaults to \[lq]no\[rq]. committed to disk when btrbk terminates. Defaults to \[lq]no\[rq].