From c097c8b0d9ccac89d27aae8dabc6e5ee8c7abf8c Mon Sep 17 00:00:00 2001 From: Joerg Steffens Date: Mon, 11 Sep 2017 14:12:20 +0200 Subject: [PATCH] NDMP_NATIVE: cleanup --- manuals/en/main/bareos.sty | 4 ++-- manuals/en/main/ndmp.tex | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/manuals/en/main/bareos.sty b/manuals/en/main/bareos.sty index 32fa287..7302e29 100644 --- a/manuals/en/main/bareos.sty +++ b/manuals/en/main/bareos.sty @@ -267,8 +267,8 @@ \newcommand{\TapeAgent}{Tape Agent\xspace} \newcommand{\RobotAgent}{Robot Agent\xspace} -\newcommand{\NdmpBareos}{NDMP\_BAREOS} -\newcommand{\NdmpNative}{NDMP\_NATIVE} +\newcommand{\NdmpBareos}{\ilink{NDMP\_BAREOS}{sec:NdmpBareos}} +\newcommand{\NdmpNative}{\ilink{NDMP\_NATIVE}{sec:NdmpNative}} % Bareos quote \newcommand{\bquote}[1]{``#1''} diff --git a/manuals/en/main/ndmp.tex b/manuals/en/main/ndmp.tex index af9d656..88a5c2a 100644 --- a/manuals/en/main/ndmp.tex +++ b/manuals/en/main/ndmp.tex @@ -179,24 +179,24 @@ \section{NDMP Backup in Bareos} \begin{center} \begin{tabular}{l | c | c} \hline - & NDMP\_NATIVE & NDMP\_BAREOS \\ + & \NdmpBareos & \NdmpNative \\ \hline -\DataManagementAgent & \bareosDir & \bareosDir \\ -\TapeAgent & external & \bareosSd \\ -requires external \TapeAgent & \bcheckmark & \\ +\DataManagementAgent & \bareosDir & \bareosDir \\ +\TapeAgent & \bareosSd & external \\ +requires external \TapeAgent & & \bcheckmark \\ backup to tape (and VTL) & \bcheckmark & \bcheckmark \\ backup to other \linkResourceDirective{Sd}{Device}{Device Type} - & & \bcheckmark \\ -2-way backup & \bcheckmark & \\ -3-way backup & untested & \bcheckmark \\ + & \bcheckmark & \\ +2-way backup & & \bcheckmark \\ +3-way backup & \bcheckmark & untested \\ Full Backups & \bcheckmark & \bcheckmark \\ Differential Backups & \bcheckmark & \bcheckmark \\ Incremental Backups & \cmlink{sec:NdmpBackupLevel} (8) & \cmlink{sec:NdmpBackupLevel} (8)\\ Single File Restore & \bcheckmark & \bcheckmark \\ -DAR & \bcheckmark & \\ -DDAR & \bcheckmark & \\ +DAR & & \bcheckmark \\ +DDAR & & \bcheckmark \\ \ilink{Copy and Migration jobs}{MigrationChapter} - & & \bcheckmark \\ + & \bcheckmark & \\ \hline \end{tabular} \end{center} @@ -1126,7 +1126,7 @@ \subsubsection{NDMP Job limitations when scanning in volumes} \subsubsection{Restore always transfers the full main backup file to the Primary Storage System} -The \NdmpBareos implementation do not support NDMP \bquote{Direct Access Restore} (DAR). +Contrary to \NdmpNative, the \NdmpBareos implementation do not support NDMP \bquote{Direct Access Restore} (DAR). On restore, the full main backup file (\path|@NDMP/...%.|) is always transfered back to the Primary Storage System,