From 4264a12148022393de2975c0782060fbf995dc8c Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 8 May 2007 15:51:31 +0000 Subject: [PATCH] Update --- docs/manual/console.tex | 10 +++++-- docs/manual/install.tex | 64 +++++++++++++++++++++++++++------------- docs/manual/tutorial.tex | 51 +++++++++++++++++--------------- 3 files changed, 79 insertions(+), 46 deletions(-) diff --git a/docs/manual/console.tex b/docs/manual/console.tex index ee9adafc..e0174b46 100644 --- a/docs/manual/console.tex +++ b/docs/manual/console.tex @@ -878,8 +878,9 @@ release storage=\lt{}storage-name\gt{} to be restored. This mode is somewhat similar to the standard Unix {\bf restore} program's interactive file selection mode. -restore storage=\lt{}storage-name\gt{} client=\lt{}client-name\gt{} +restore storage=\lt{}storage-name\gt{} client=\lt{}backup-client-name\gt{} where=\lt{}path\gt{} pool=\lt{}pool-name\gt{} fileset=\lt{}fileset-name\gt{} + restoreclient=\lt{}restore-client-name\gt{} select current all done Where {\bf current}, if specified, tells the restore command to @@ -890,6 +891,11 @@ restore storage=\lt{}storage-name\gt{} client=\lt{}client-name\gt{} command, please see the \ilink{Restore Chapter}{RestoreChapter} of this manual. + The client keyword initially specifies the client from which the backup + was made and the client to which the restore will be make. However, + if the restoreclient keyword is specified, then the restore is written + to that client. + \item [run] \index[console]{run} This command allows you to schedule jobs to be run immediately. The full form @@ -1323,10 +1329,10 @@ Choose a query (1-9): \normalsize If specified with a specific JobId, ... the wait command will wait for that particular job to terminate before continuing. + \end{description} \label{dotcommands} - \section{Special dot Commands} \index[general]{Commands!Special dot} \index[general]{Special dot Commands} diff --git a/docs/manual/install.tex b/docs/manual/install.tex index 9bb0c75e..870c19ff 100644 --- a/docs/manual/install.tex +++ b/docs/manual/install.tex @@ -23,7 +23,7 @@ them. \index[general]{Release Files} Beginning with Bacula 1.38.0, the source code has been broken into four separate tar files each corresponding to a different module in -the Bacula CVS. The released files are: +the Bacula SVN. The released files are: \begin{description} \item [bacula-1.38.0.tar.gz] @@ -657,12 +657,12 @@ customize your installation. keeping this option enabled as it helps detect memory leaks. This configuration parameter is used while building Bacula -\item [ {-}{-}enable-GNOME ] - \index[general]{{-}{-}enable-GNOME} +\item [ {-}{-}enable-gnome ] + \index[general]{{-}{-}enable-gnome} If you have GNOME installed on your computer including the GNOME development libraries, and you want to use the GNOME GUI Console interface to Bacula, you must specify this option. - Doing so will build everything in the {\bf src/GNOME-console} directory. + Doing so will build everything in the {\bf src/gnome-console} directory. \item [ {-}{-}enable-bwx-console ] \index[general]{{-}{-}enable-bwx-console} @@ -691,7 +691,6 @@ customize your installation. not enabled this option, or explicitly disable static linking by adding {\bf \verb:--:disable-static-tools}. - \item [ {-}{-}enable-static-fd] \index[general]{{-}{-}enable-static-fd} This option causes the make process to build a {\bf static-bacula-fd} in @@ -731,7 +730,6 @@ customize your installation. libraries. You may be able to enable those options, but you will need to load additional static libraries. - \item [ {-}{-}enable-static-dir] \index[general]{{-}{-}enable-static-dir} @@ -828,9 +826,9 @@ customize your installation. \item [ {-}{-}with-sqlite=\lt{}sqlite-path\gt{}] \index[general]{{-}{-}with-sqlite} - This enables use of the SQLite version 2.8.x database. The {\bf sqlite-path} is not - normally specified as Bacula looks for the necessary components in a - standard location ({\bf depkgs/sqlite}). See + This enables use of the SQLite version 2.8.x database. The {\bf + sqlite-path} is not normally specified as Bacula looks for the necessary + components in a standard location ({\bf depkgs/sqlite}). See \ilink{Installing and Configuring SQLite}{SqlLiteChapter} chapter of this manual for more details. @@ -882,17 +880,14 @@ customize your installation. \ilink{Bacula PKI -- Data Encryption}{DataEncryption} chapter of this manual. - - \item [ {-}{-}with-python=\lt{}path\gt{}] \index[general]{{-}{-}with-python} - This option enables Bacula support for Python. If no path is - supplied, configure will search the - standard library locations for Python 2.2, 2.3, or 2.4. If it cannot - find the library, you will need to supply a path to your Python - library directory. Please see the - \ilink{Python chapter}{PythonChapter} for the details of using - Python scripting. + This option enables Bacula support for Python. If no path is supplied, + configure will search the standard library locations for Python 2.2, + 2.3, 2.4, or 2.5. If it cannot find the library, you will need to + supply a path to your Python library directory. Please see the + \ilink{Python chapter}{PythonChapter} for the details of using Python + scripting. \item [ {-}{-}with-libintl-prefix=\lt{}DIR\gt{}] \index[general]{{-}{-}with-libintl-prefix} @@ -991,7 +986,7 @@ customize your installation. \item [ {-}{-}with-dir-password=\lt{}Password\gt{}] \index[general]{{-}{-}with-dir-password} - This option allows you to specify the password used to access the Directory + This option allows you to specify the password used to access the Director (normally from the Console program). If it is not specified, configure will automatically create a random password. @@ -1003,7 +998,7 @@ customize your installation. \item [ {-}{-}with-sd-password=\lt{}Password\gt{} ] \index[general]{{-}{-}with-sd-password} - This option allows you to specify the password used to access the Directory + This option allows you to specify the password used to access the Storage daemon (normally called from the Director). If it is not specified, configure will automatically create a random password. @@ -1017,7 +1012,6 @@ customize your installation. create the User prior to running {\bf make install}, because the working directory owner will be set to {\bf User}. - \item [ {-}{-}with-dir-group=\lt{}Group\gt{} ] \index[general]{{-}{-}with-dir-group} This option allows you to specify the GroupId used to run the Director. The @@ -1059,6 +1053,34 @@ customize your installation. root, however, after doing preliminary initializations, it can "drop" to the GroupId specified on this option. +\item [ {-}{-}with-mon-dir-password=\lt{}Password\gt{}] + \index[general]{{-}{-}with-mon-dir-password} + This option allows you to specify the password used to access the Directory + from the monitor. If it is not specified, configure will + automatically create a random password. + +\item [ {-}{-}with-mon-fd-password=\lt{}Password\gt{} ] + \index[general]{{-}{-}with-mon-fd-password} + This option allows you to specify the password used to access the File daemon + from the Monitor. If it is not specified, configure will + automatically create a random password. + +\item [ {-}{-}with-mon-sd-password=\lt{}Password\gt{} ] + \index[general]{{-}{-}with-mon-sd-password} + This option allows you to specify the password used to access the + Storage daemon from the Monitor. If it is not specified, configure will + automatically create a random password. + +\item [ {-}{-}with-db-name=\lt{}database-name\gt{} ] + \index[general]{{-}{-}with-db-name} + This option allows you to specify the database name to be used in + the conf files. The default is bacula. + +\item [ {-}{-}with-db-user=\lt{}database-user\gt{} ] + \index[general]{{-}{-}with-db-user} + This option allows you to specify the database user name to be used in + the conf files. The default is bacula. + \end{description} Note, many other options are presented when you do a {\bf ./configure diff --git a/docs/manual/tutorial.tex b/docs/manual/tutorial.tex index 6ccc8740..e9505b31 100644 --- a/docs/manual/tutorial.tex +++ b/docs/manual/tutorial.tex @@ -657,15 +657,16 @@ The restore job will require the following Volumes: TestVolume001 1444 files selected to restore. Run Restore job -JobName: RestoreFiles -Bootstrap: /home/kern/bacula/testbin/working/restore.bsr -Where: /tmp/bacula-restores -Replace: always -FileSet: Full Set -Client: rufus-fd -Storage: File -JobId: *None* -When: 2005-04-28 14:53:54 +JobName: RestoreFiles +Bootstrap: /home/kern/bacula/testbin/working/restore.bsr +Where: /tmp/bacula-restores +Replace: always +FileSet: Full Set +Backup Client: rufus-fd +Restore Client: rufus-fd +Storage: File +JobId: *None* +When: 2005-04-28 14:53:54 OK to run? (yes/mod/no): \end{verbatim} \normalsize @@ -680,22 +681,25 @@ similar to this: \footnotesize \begin{verbatim} -28-Apr-2005 14:56 rufus-dir: Bacula 1.30 (28Apr03): 28-Apr-2003 14:56 +28-Apr-2005 14:56 rufus-dir: Bacula 2.1.8 (08May07): 08-May-2007 14:56:06 +Build OS: i686-pc-linux-gnu suse 10.2 JobId: 2 -Job: RestoreFiles.2005-04-28_14.56.06 -Client: rufus-fd -Start time: 28-Apr-2005 14:56 -End time: 28-Apr-2005 14:56 +Job: RestoreFiles.2007-05-08_14.56.06 +Restore Client: rufus-fd +Start time: 08-May-2007 14:56 +End time: 08-May-2007 14:56 Files Restored: 1,444 Bytes Restored: 38,816,381 Rate: 9704.1 KB/s +FD Errors: 0 FD termination status: OK +SD termination status: OK Termination: Restore OK -28-Apr-2005 14:56 rufus-dir: Begin pruning Jobs. -28-Apr-2005 14:56 rufus-dir: No Jobs found to prune. -28-Apr-2005 14:56 rufus-dir: Begin pruning Files. -28-Apr-2005 14:56 rufus-dir: No Files found to prune. -28-Apr-2005 14:56 rufus-dir: End auto prune. +08-May-2007 14:56 rufus-dir: Begin pruning Jobs. +08-May-2007 14:56 rufus-dir: No Jobs found to prune. +08-May-2007 14:56 rufus-dir: Begin pruning Files. +08-May-2007 14:56 rufus-dir: No Files found to prune. +08-May-2007 14:56 rufus-dir: End auto prune. \end{verbatim} \normalsize @@ -1118,14 +1122,14 @@ Console program accepts the following options: \item [-c \lt{}file\gt{}] \index[sd]{-c \lt{}file\gt{} } Define the file to use as a configuration file. The default is the daemon -name followed by {\bf .conf} i.e. {\bf bacula-dir.conf} for the Director, -{\bf bacula-fd.conf} for the File daemon, and {\bf bacula-sd} for the Storage -daemon. + name followed by {\bf .conf} i.e. {\bf bacula-dir.conf} for the Director, + {\bf bacula-fd.conf} for the File daemon, and {\bf bacula-sd} for the Storage + daemon. \item [-d nn] \index[sd]{-d nn } Set the debug level to {\bf nn}. Higher levels of debug cause more -information to be displayed on STDOUT concerning what the daemon is doing. + information to be displayed on STDOUT concerning what the daemon is doing. \item [-f] Run the daemon in the foreground. This option is needed to run the daemon @@ -1154,6 +1158,7 @@ The Director has the following additional Director specific option: \item [-r \lt{}job\gt{}] \index[fd]{-r \lt{}job\gt{} } Run the named job immediately. This is for debugging and should not be used. + \end{description} The File daemon has the following File daemon specific option: -- 2.39.5