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

btrbk: add support for btrfs-progs v4.4

pull/73/head
Axel Burri 2016-01-20 17:53:36 +01:00
parent 9595adc2a5
commit 7a4aa4b650
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
btrbk-current
* Support for btrfs-progs v4.4 (close: #66).
btrbk-0.22.0 btrbk-0.22.0
* Bugfix: fix monthly schedule if older than 10 weeks (close: #59). * Bugfix: fix monthly schedule if older than 10 weeks (close: #59).

6
btrbk
View File

@ -48,7 +48,7 @@ use Getopt::Long qw(GetOptions);
use POSIX qw(strftime); use POSIX qw(strftime);
use Data::Dumper; use Data::Dumper;
our $VERSION = "0.22.0"; our $VERSION = "0.22.1-dev";
our $AUTHOR = 'Axel Burri <axel@tty0.ch>'; our $AUTHOR = 'Axel Burri <axel@tty0.ch>';
our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>'; our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>';
@ -1033,7 +1033,9 @@ sub btrfs_subvolume_detail($)
} }
my %detail = ( REAL_PATH => $real_path ); my %detail = ( REAL_PATH => $real_path );
if($ret =~ /^\Q$real_path\E is btrfs root/) { if($ret =~ /^\Q$real_path\E is (btrfs root|toplevel subvolume)/) {
# btrfs-progs < 4.4 prints: "<subvol> is btrfs root"
# btrfs-progs >= 4.4 prints: "<subvol> is toplevel subvolume"
DEBUG "found btrfs root: $vol->{PRINT}"; DEBUG "found btrfs root: $vol->{PRINT}";
$detail{id} = 5; $detail{id} = 5;
$detail{is_root} = 1; $detail{is_root} = 1;