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

Merge 97516081fd into 62fad0e326

pull/180/merge
Wicher 2017-09-22 13:06:53 +00:00 committed by GitHub
parent 62fad0e326 97516081fd
commit 85d6f8eda9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
btrbk
View File

@ -1,4 +1,4 @@
#!/usr/bin/perl -T #!/usr/bin/env perl
# #
# btrbk - Create snapshots and remote backups of btrfs subvolumes # btrbk - Create snapshots and remote backups of btrfs subvolumes
# #
@ -1829,6 +1829,7 @@ sub vinfo_rsh($;@)
my @ssh_options = ('-q'); my @ssh_options = ('-q');
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', $ssh_cipher_spec) if($ssh_cipher_spec ne "default"); push(@ssh_options, '-c', $ssh_cipher_spec) if($ssh_cipher_spec ne "default");
push(@ssh_options, '-q');
if($ssh_identity) { if($ssh_identity) {
push(@ssh_options, '-i', $ssh_identity); push(@ssh_options, '-i', $ssh_identity);
} else { } else {
@ -3690,11 +3691,6 @@ sub exit_status
MAIN: MAIN:
{ {
# set PATH instead of using absolute "/sbin/btrfs" (for now), as
# different distros (and even different versions of btrfs-progs)
# install the "btrfs" executable to different locations.
$ENV{PATH} = '/sbin:/bin:/usr/sbin:/usr/bin';
Getopt::Long::Configure qw(gnu_getopt); Getopt::Long::Configure qw(gnu_getopt);
my $start_time = time; my $start_time = time;
@tm_now = localtime($start_time); @tm_now = localtime($start_time);