From 7a4aa4b650cbab9a0f309b62a4f16161c40e70ec Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Wed, 20 Jan 2016 17:53:36 +0100 Subject: [PATCH] btrbk: add support for btrfs-progs v4.4 --- ChangeLog | 4 ++++ btrbk | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2487c9..8401edf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +btrbk-current + + * Support for btrfs-progs v4.4 (close: #66). + btrbk-0.22.0 * Bugfix: fix monthly schedule if older than 10 weeks (close: #59). diff --git a/btrbk b/btrbk index b532c70..0ecbfed 100755 --- a/btrbk +++ b/btrbk @@ -48,7 +48,7 @@ use Getopt::Long qw(GetOptions); use POSIX qw(strftime); use Data::Dumper; -our $VERSION = "0.22.0"; +our $VERSION = "0.22.1-dev"; our $AUTHOR = 'Axel Burri '; our $PROJECT_HOME = ''; @@ -1033,7 +1033,9 @@ sub btrfs_subvolume_detail($) } 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: " is btrfs root" + # btrfs-progs >= 4.4 prints: " is toplevel subvolume" DEBUG "found btrfs root: $vol->{PRINT}"; $detail{id} = 5; $detail{is_root} = 1;