diff --git a/btrbk b/btrbk index 543f49c..a942ec7 100755 --- a/btrbk +++ b/btrbk @@ -65,7 +65,7 @@ my $ipv6_addr_match = qr/[a-fA-F0-9]*:[a-fA-F0-9]*:[a-fA-F0-9:]+/; # simplified my $host_name_match = qr/(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])/; my $uuid_match = qr/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/; my $btrbk_timestamp_match = qr/(?[0-9]{4})(?[0-9]{2})(?
[0-9]{2})(T(?[0-9]{2})(?[0-9]{2})((?[0-9]{2})(?(Z|[+-][0-9]{4})))?)?(_(?[0-9]+))?/; # matches "YYYYMMDD[Thhmm[ss+0000]][_NN]" -my $raw_postfix_match = qr/\.btrfs(\.($compress_format_alt))?(\.(gpg|encrypted))?/; # matches ".btrfs[.gz|bz2|xz][.gpg|encrypted]" +my $raw_postfix_match = qr/\.btrfs(\.($compress_format_alt))?(\.(gpg|encrypted))?/; # matches ".btrfs[.gz|.bz2|.xz|...][.gpg|.encrypted]" my $safe_file_match = qr/[0-9a-zA-Z_@\+\-\.\/]+/; # note: ubuntu uses '@' in the subvolume layout: my $group_match = qr/[a-zA-Z0-9_:-]+/; @@ -2010,7 +2010,7 @@ sub system_read_raw_info_dir($) '-maxdepth', '1', '-type', 'f', '!', '-size', '0', - '-name', '\*.btrfs.\*info', # match ".btrfs[.gz|bz2|xz][.gpg].info" + '-name', '\*.btrfs.\*info', # match ".btrfs[.gz|.bz2|.xz|...][.gpg].info" '-exec', 'echo INFO_FILE=\{\} \;', '-exec', 'cat \{\} \;' ], diff --git a/contrib/migration/raw_suffix2sidecar b/contrib/migration/raw_suffix2sidecar index 0b17cc9..4ee6a06 100755 --- a/contrib/migration/raw_suffix2sidecar +++ b/contrib/migration/raw_suffix2sidecar @@ -42,7 +42,7 @@ my $compress_format_alt = 'gz|bz2|xz|lzo|lz4'; my $file_match = qr/[0-9a-zA-Z_@\+\-\.\/]+/; # note: ubuntu uses '@' in the subvolume layout: my $uuid_match = qr/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/; my $timestamp_postfix_match = qr/\.(?[0-9]{4})(?[0-9]{2})(?
[0-9]{2})(T(?[0-9]{2})(?[0-9]{2})((?[0-9]{2})(?(Z|[+-][0-9]{4})))?)?(_(?[0-9]+))?/; # matches "YYYYMMDD[Thhmm[ss+0000]][_NN]" -my $raw_postfix_match = qr/--(?$uuid_match)(\@(?$uuid_match))?\.btrfs?(\.(?($compress_format_alt)))?(\.(?gpg))?(\.(?split_aa))?(\.(?part))?/; # matches ".btrfs_[@][.gz|bz2|xz][.gpg][.split_aa][.part]" +my $raw_postfix_match = qr/--(?$uuid_match)(\@(?$uuid_match))?\.btrfs?(\.(?($compress_format_alt)))?(\.(?gpg))?(\.(?split_aa))?(\.(?part))?/; # matches ".btrfs_[@][.gz|.bz2|.xz|...][.gpg][.split_aa][.part]" my $dryrun; diff --git a/doc/btrbk.conf.5.asciidoc b/doc/btrbk.conf.5.asciidoc index caa91ab..f75e2d4 100644 --- a/doc/btrbk.conf.5.asciidoc +++ b/doc/btrbk.conf.5.asciidoc @@ -612,8 +612,8 @@ files)! Raw backups consist of two files: the main data file containing the btrfs send stream, and a sidecar file ".info" containing metadata: - .[_N].btrfs[.gz|.bz2|.xz][.gpg] - .[_N].btrfs[.gz|.bz2|.xz][.gpg].info + .[_N].btrfs[.gz|.bz2|...][.gpg] + .[_N].btrfs[.gz|.bz2|...][.gpg].info For 'incremental' backups ("incremental yes"), please note that: