From 4f92f9462ef3541dd35b437cbf4a9aa1d271e409 Mon Sep 17 00:00:00 2001 From: Kevin Yin Date: Thu, 23 Nov 2023 07:48:26 -0800 Subject: [PATCH] Port changes to master --- docs/changes_1.x.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changes_1.x.rst b/docs/changes_1.x.rst index 719eff032..a669c20d6 100644 --- a/docs/changes_1.x.rst +++ b/docs/changes_1.x.rst @@ -44,13 +44,14 @@ no matter what encryption mode they use, including "none"): - ``borg check`` would complain about archives without a valid archive TAM. - ``borg check --repair`` would remove such archives! -2. Run ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg info --debug 2>&1 | grep TAM | grep -i manifest``. +2. Run: ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg info --debug 2>&1 | grep TAM | grep -i manifest`` a) If you get "TAM-verified manifest", continue with 3. b) If you get "Manifest TAM not found and not required", run ``borg upgrade --tam --force `` *on every client*. -3. Run ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg list --consider-checkpoints --format='{name} {time} tam:{tam}{NL}' ``. +3. Run: ``BORG_WORKAROUNDS=ignore_invalid_archive_tam borg list --consider-checkpoints --format='{name} {time} tam:{tam}{NL}' `` + "tam:verified" means that the archive has a valid TAM authentication. "tam:none" is expected as output for archives created by borg <1.0.9. "tam:none" is also expected for archives resulting from a borg rename