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

btrbk, ssh_filter_btrbk.sh: set PATH=/sbin:/bin:/usr/sbin:/usr/bin and call "btrfs" instead of using absolute "/sbin/btrfs". for compatibility with all distros out there. 

- debian jessie (stable): btrfs-tools-3.17-1.1: `/sbin/btrfs`
  - debian sid (unstable): btrfs-tools-4.0-2: `/bin/btrfs`
  - gentoo: sys-fs/btrfs-progs-4.0: `/sbin/btrfs`
  - arch: btrfs-progs-4.0-2: `/usr/bin/btrfs`
pull/30/head
Axel Burri 2015-05-18 21:18:57 +02:00
parent 5bfba3602e
commit bea010dce0
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
btrbk
View File

@ -47,7 +47,7 @@ use Date::Calc qw(Today Delta_Days Day_of_Week);
use Getopt::Std;
use Data::Dumper;
our $VERSION = "0.17.1";
our $VERSION = "0.17.2-dev";
our $AUTHOR = 'Axel Burri <axel@tty0.ch>';
our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>';
@ -541,7 +541,7 @@ sub parse_config(@)
sub btrfs_filesystem_show_all_local()
{
return run_cmd("/sbin/btrfs filesystem show", 1);
return run_cmd("btrfs filesystem show", 1);
}
@ -550,7 +550,7 @@ sub btrfs_filesystem_show($)
my $vol = shift || die;
my $path = $vol->{PATH} // die;
my $rsh = $vol->{RSH} || "";
my $ret = run_cmd("$rsh /sbin/btrfs filesystem show '$path'", 1);
my $ret = run_cmd("$rsh btrfs filesystem show '$path'", 1);
return $ret;
}
@ -560,7 +560,7 @@ sub btrfs_filesystem_df($)
my $vol = shift || die;
my $path = $vol->{PATH} // die;
my $rsh = $vol->{RSH} || "";
my $ret = run_cmd("$rsh /sbin/btrfs filesystem df '$path'", 1);
my $ret = run_cmd("$rsh btrfs filesystem df '$path'", 1);
return $ret;
}
@ -570,7 +570,7 @@ sub btrfs_filesystem_usage($)
my $vol = shift || die;
my $path = $vol->{PATH} // die;
my $rsh = $vol->{RSH} || "";
my $ret = run_cmd("$rsh /sbin/btrfs filesystem usage '$path'", 1);
my $ret = run_cmd("$rsh btrfs filesystem usage '$path'", 1);
return $ret;
}
@ -580,7 +580,7 @@ sub btrfs_subvolume_detail($)
my $vol = shift || die;
my $path = $vol->{PATH} // die;
my $rsh = $vol->{RSH} || "";
my $ret = run_cmd("$rsh /sbin/btrfs subvolume show '$path' 2>/dev/null", 1);
my $ret = run_cmd("$rsh btrfs subvolume show '$path' 2>/dev/null", 1);
return undef unless(defined($ret));
my $real_path;
@ -639,7 +639,7 @@ sub btrfs_subvolume_list($;@)
$filter_option = "-o" if($opts{subvol_only});
my $display_options = "-c -u -q";
$display_options .= " -R" unless($btrfs_progs_compat);
my $ret = run_cmd("$rsh /sbin/btrfs subvolume list $filter_option $display_options '$path'", 1);
my $ret = run_cmd("$rsh btrfs subvolume list $filter_option $display_options '$path'", 1);
return undef unless(defined($ret));
my @nodes;
@ -699,7 +699,7 @@ sub btrfs_subvolume_find_new($$;$)
my $path = $vol->{PATH} // die;
my $rsh = $vol->{RSH} || "";
my $lastgen = shift // die;
my $ret = run_cmd("$rsh /sbin/btrfs subvolume find-new '$path' $lastgen");
my $ret = run_cmd("$rsh btrfs subvolume find-new '$path' $lastgen");
unless(defined($ret)) {
ERROR "Failed to fetch modified files for: $vol->{PRINT}";
return undef;
@ -762,7 +762,7 @@ sub btrfs_subvolume_snapshot($$)
DEBUG "[btrfs] source: $src_path";
DEBUG "[btrfs] target: $target_path";
INFO ">>> " . ($svol->{HOST} ? "{$svol->{HOST}}" : "") . $target_path;
my $ret = run_cmd("$rsh /sbin/btrfs subvolume snapshot -r '$src_path' '$target_path'");
my $ret = run_cmd("$rsh btrfs subvolume snapshot -r '$src_path' '$target_path'");
ERROR "Failed to create btrfs subvolume snapshot: $svol->{PRINT} -> $target_path" unless(defined($ret));
return defined($ret) ? $target_path : undef;
}
@ -786,7 +786,7 @@ sub btrfs_subvolume_delete($@)
DEBUG "[btrfs] subvolume: $_->{PRINT}" foreach(@$targets);
my $options = "";
$options = "--commit-$commit " if($commit);
my $ret = run_cmd("$rsh /sbin/btrfs subvolume delete $options" . join(' ', map( { "'$_->{PATH}'" } @$targets)));
my $ret = run_cmd("$rsh btrfs subvolume delete $options" . join(' ', map( { "'$_->{PATH}'" } @$targets)));
ERROR "Failed to delete btrfs subvolumes: " . join(' ', map( { $_->{PRINT} } @$targets)) unless(defined($ret));
return defined($ret) ? scalar(@$targets) : undef;
}
@ -816,7 +816,7 @@ sub btrfs_send_receive($$$)
my $receive_option = "";
$receive_option = "-v" if($loglevel >= 3);
my $cmd = "$snapshot_rsh /sbin/btrfs send $parent_option '$snapshot_path' | $target_rsh /sbin/btrfs receive $receive_option '$target_path/'";
my $cmd = "$snapshot_rsh btrfs send $parent_option '$snapshot_path' | $target_rsh btrfs receive $receive_option '$target_path/'";
my $ret = run_cmd($cmd);
unless(defined($ret)) {
ERROR "Failed to send/receive btrfs subvolume: $snapshot->{PRINT} " . ($parent_path ? "[$parent_path]" : "") . " -> $target->{PRINT}";
@ -1252,7 +1252,11 @@ sub schedule(@)
MAIN:
{
$ENV{PATH} = '';
# 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::Std::STANDARD_HELP_VERSION = 1;
$Data::Dumper::Sortkeys = 1;
my $start_time = time;

18
ssh_filter_btrbk.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
export PATH=
export PATH=/sbin:/bin:/usr/sbin:/usr/bin
if [ "$1" = "-l" ]; then
enable_log=1
@ -33,13 +33,13 @@ case "$SSH_ORIGINAL_COMMAND" in
*\>*) reject_and_die ;;
*\`*) reject_and_die ;;
*\|*) reject_and_die ;;
/sbin/btrfs\ subvolume\ show\ *) run_cmd ;; # mandatory
/sbin/btrfs\ subvolume\ list\ *) run_cmd ;; # mandatory
/sbin/btrfs\ subvolume\ snapshot\ *) run_cmd ;; # mandatory if this host is backup source
/sbin/btrfs\ send\ *) run_cmd ;; # mandatory if this host is backup source
/sbin/btrfs\ receive\ *) run_cmd ;; # mandatory if this host is backup target
/sbin/btrfs\ subvolume\ delete\ *) run_cmd ;; # mandatory if scheduling is active
/sbin/btrfs\ subvolume\ find-new\ *) run_cmd ;; # needed for "btrbk diff"
/sbin/btrfs\ filesystem\ usage\ *) run_cmd ;; # needed for "btrbk info"
btrfs\ subvolume\ show\ *) run_cmd ;; # mandatory
btrfs\ subvolume\ list\ *) run_cmd ;; # mandatory
btrfs\ subvolume\ snapshot\ *) run_cmd ;; # mandatory if this host is backup source
btrfs\ send\ *) run_cmd ;; # mandatory if this host is backup source
btrfs\ receive\ *) run_cmd ;; # mandatory if this host is backup target
btrfs\ subvolume\ delete\ *) run_cmd ;; # mandatory if scheduling is active
btrfs\ subvolume\ find-new\ *) run_cmd ;; # needed for "btrbk diff"
btrfs\ filesystem\ usage\ *) run_cmd ;; # needed for "btrbk info"
*) reject_and_die ;;
esac