From d4ab986245d50149c016fc9a6e5d5ecdf5ecf645 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Tue, 7 Jun 2022 00:32:44 +0200 Subject: [PATCH] btrbk: skip subvolume init on archive --- btrbk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/btrbk b/btrbk index 09c11dc..aa61e47 100755 --- a/btrbk +++ b/btrbk @@ -6295,6 +6295,14 @@ MAIN: } foreach my $svol (vinfo_subsection($sroot, 'subvolume')) { DEBUG "Initializing subvolume section: $svol->{PRINT}"; + my $snaproot = vinfo_snapshot_root($svol); + unless(vinfo_init_root($snaproot)) { + ABORTED($svol, "Failed to fetch subvolume detail for snapshot_dir"); + WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol), @stderr; + next; + } + next if($skip_snapshots || $action_archive); + unless(vinfo_init_root($svol)) { ABORTED($svol, "Failed to fetch subvolume detail"); WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol), @stderr; @@ -6315,13 +6323,6 @@ MAIN: WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol); next; } - - my $snaproot = vinfo_snapshot_root($svol); - unless(vinfo_init_root($snaproot)) { - ABORTED($svol, "Failed to fetch subvolume detail for snapshot_dir"); - WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol), @stderr; - next; - } unless(_is_same_fs_tree($snaproot->{node}, $svol->{node})) { ABORTED($svol, "Snapshot path is not on same filesystem"); WARN "Skipping subvolume \"$svol->{PRINT}\": " . ABORTED_TEXT($svol);