Imported Upstream version 0.0.21

5a8e5f45 · Nigel Kukard · 5a8e5f45 · 5a8e5f45 · 5a8e5f45 · 5a8e5f45
Commit 5a8e5f45 authored Jun 09, 2014 by Nigel Kukard
--- a/ChangeLog
+++ b/ChangeLog
+commit 74d05964428e404cde70efe01f43426a2dcaed22
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 14:02:54 2014 +0000
+
+    Added watch and upstream key
+
+commit 4eb7a0c67aae0cbfbe4304375a1b00f1d7efb9d7
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 13:59:13 2014 +0000
+
+    Bumped version
+
+commit 24ff56c38b5ef624994fec7c9fce11083b19697d
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 13:58:49 2014 +0000
+
+    Fixed up debian packaging
+
+commit c3d0601308d8db5f800452b95b404747ce2298b4
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jun 9 13:53:14 2014 +0000
+
+    Updated copyright date
+
+commit 05a39fbaf37acbd54a4591f59e459c43ff176043
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Feb 9 15:35:47 2014 +0000
+
+    Fixed whitespaces
+
+commit 669a63066152778c51897c34a2a38f8254cf76a0
+Merge: af2ff41 6ae1e22
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Oct 28 10:53:58 2013 +0000
+
+    Merge tag 'v0.0.20' into v0.0.x
+
+commit 6ae1e22622150d406f49c06174a40602b2efe8cd
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sat Oct 26 19:34:46 2013 +0000
+
+    Bumped version
+
+commit af2ff417e49d88a183bf846da0aefbf8e4dccfcc
+Merge: 295b264 8f42247
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 10:06:25 2012 +0000
+
+    Merge branch 'v0.0.x' of git.devlabs.linuxassist.net:awit-dbackup into v0.0.x
+
+commit 295b264ab7b01ae796c5517ef9142f4f1bacd9e2
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 10:03:49 2012 +0000
+
+    Bumped stable version to 0.0.19
+
+commit 09b0729ac400f2b88dda613bd4459dfbeb696d33
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 09:51:33 2012 +0000
+
+    Added debian packaging files
+
+commit eec6b0d0391aa0b9927d92072838284d91c2c663
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 08:05:07 2012 +0000
+
+    Use default config file /etc/dbackup.conf
+
+commit 5e51cf403919c2d4cae8536ee36c7bb6e2b1bfc2
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 07:56:46 2012 +0000
+
+    Fixed another help typo, thanks Psi-jack
+
+commit 5577f228cf118cf5ba8f2bf082408aabc2a22e33
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 07:46:30 2012 +0000
+
+    Removed -r, only long options are supported
+
+commit 65e83b8a55dcc3e0d32ff1d4a87e4372a3d8f87a
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Sep 28 07:40:35 2012 +0000
+
+    Fixed typo, thanks to Psi-jack
+
+commit 8cf0a7294924c925f630141faff4b846f2f4036a
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Sep 25 12:42:25 2012 +0000
+
+    Don't exit if tar fails
+    
+    If we exit when tar fails we may not get to backup whats after it.
+
+commit 7cfdb436dc6bf1ace079cdadd81252699297c5f7
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sat Sep 15 20:00:40 2012 +0000
+
+    Added more default exclusions & fixed tar dev vers
+
+commit 1505f1b95d79f8d816a3e655b6cc34d10dad3c01
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jun 24 17:27:28 2012 +0000
+
+    Bumped version
+
+commit 8f42247b3bcd4fbc379b909c4996b1cd1bc37cee
+Merge: fbb3a45 a449d2e
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jun 24 17:26:31 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+
+commit a449d2ee978bbf44d7e32904c4d963d4434186d3
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jun 24 17:25:58 2012 +0000
+
+    -b is not actually supported
+    
+    Thanks to Psi-Jack for picking it up
+
+commit fbb3a45d327364b96f11918a93141457f1415ffb
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Thu Feb 2 20:58:03 2012 +0000
+
+    Fixed log levels in --help
+
+commit 93f2b2e92e96f0d8f78e41e9d14335064c9b6d41
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Thu Feb 2 20:58:03 2012 +0000
+
+    Fixed log levels in --help
+
+commit d2e63f03f6ffd194bd7028ea739cfdbdfb014734
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 24 15:19:38 2012 +0000
+
+    Bump version again
+
+commit 78461c0dd9501414a537673b9a223e9b4590205c
+Merge: fd79e4b 72e1d5e
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 24 15:19:03 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+
+commit 72e1d5e04b6dd0458f7dc64e2e88109573bcb24c
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 24 15:18:31 2012 +0000
+
+    Some more logging fixes
+    Document version upgrades
+
+commit fd79e4b370de8b4a772c4db56f896bc0ab3d2407
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 24 15:18:31 2012 +0000
+
+    Some more logging fixes
+    Document version upgrades
+
+commit 79cf32e2d22cbe620a753e96cce4bb1b5828ec1a
+Merge: c091f72 fafceef
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jan 23 15:46:21 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+
+commit fafceefcd166f6f90695025ad75885386ebdc251
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jan 23 15:45:59 2012 +0000
+
+    Improve compatibility for diff versions of Config::IniFiles
+
+commit c091f72dabe3394c57081cfbffecf333885a487e
+Merge: 27f19e6 72ae973
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jan 22 21:19:59 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+
+commit 72ae9739e6f41283634b72c8b0651ee6f3bf7cc2
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jan 22 21:19:31 2012 +0000
+
+    Force update on dir if its empty and we doing an upgrade
+
+commit 27f19e6f473db3be7a91844fa70db4ad010215ec
+Merge: 0665ee0 984e773
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jan 22 16:02:22 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+
+commit 984e773b23122ba4af87680ee26a82cba012a536
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sun Jan 22 16:01:27 2012 +0000
+
+    Fixed up logging a bit
+    Added --backup-upgrade option to upgrade data
+
+commit db2eb6bc87358cbc4df2b1122649d9d8918a8096
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Wed Jan 18 21:06:16 2012 +0000
+
+    Fixed another occurance of using %d instead of %s
+    Fixed up messages displayed a bit
+
+commit a1585f8763e1f7bef643090346f4ced50d97e6c3
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Wed Jan 18 20:36:27 2012 +0000
+
+    Added squid spool to exclude list
+    Fixed bug reporting tar exit status
+    Use lchown not chown when chowing on restore
+    Don't chmod & utime for symlinks
+    Fixed UNKNOWN displaying in the logs insted of ERROR
+
+commit 0665ee0857b06311537d5f46d564873ada026fe4
+Merge: bd47913 422ad8a
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Jan 13 10:07:00 2012 +0000
+
+    Merge branch 'master' into v0.0.x
+    
+    Conflicts:
+    	dbackup
+
+commit bd479137cd2d47fee502eb64156544db0bb51eed
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Jan 13 10:05:58 2012 +0000
+
+    Bumped to 0.0.15
+
+commit 422ad8a478ccb59eeca494236c0167d7290f6309
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Thu Jan 12 22:29:33 2012 +0000
+
+    Added --tar-ignore-failed-read option
+    Improved exclusion of directories
+
+commit 60cfdb321a6d138d765190dd89a870abad1e02e9
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 10 16:00:02 2012 +0000
+
+    Adjusted version to designate we're v0.0.x
+
+commit 5d4ebc1bed31bc338d2c4e73cb9b8a0c75d95576
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 10 15:56:33 2012 +0000
+
+    Added yum cache to system excludes list
+    Updated requirements
+
+commit 94b79db6b2753bfea914bc0bdbb7afbd847c3693
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Mon Jan 9 12:30:33 2012 +0000
+
+    Fixed manifest-format handling
+
+commit f52cc55c6c0df5704b1aa18e301df285a4c445de
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sat Jan 7 17:32:16 2012 +0000
+
+    Added --tar to give path to tar binary
+
+commit 724de4c0a7670316250a2410bd8ad775f03c2cc3
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Sat Jan 7 17:31:30 2012 +0000
+
+    Better support for other versions of tar
+
+commit 3253de2cc4b60d66dd90459a98cb46d8e77e8ce8
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Jan 6 12:11:43 2012 +0000
+
+    Added postfix public socket dir exclude
+
+commit a7095dde12dc96d1a368e7a41ee3dba2ee721a0b
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Fri Jan 6 05:36:53 2012 +0000
+
+    Added --exclude-fs-type to --help
+
+commit 37af5a45dd9b6fcfdfe8c3553f1eabb4db056123
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Thu Jan 5 20:10:57 2012 +0000
+
+    Added --exclude-fs-type= support
+    Cleaned up commandline args & config args
+
+commit 7f74758bea9eee5904bc573f410c2fa77fc1214e
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Thu Jan 5 12:52:20 2012 +0000
+
+    Added logging
+
+commit e3fd3cd1f924f2c2eb6e585914b1f45a5749d4b2
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Wed Jan 4 13:31:17 2012 +0000
+
+    Updated config file with some more doc
+
+commit 868e1cca4b4580a372a0d738b9953d3f6a319a51
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Wed Jan 4 13:30:51 2012 +0000
+
+    Various commandline updates and fixes,check --help
+
+commit 986da204d1fa791bf8e1627dabbfc8a6972016fd
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 3 21:19:16 2012 +0000
+
+    Added --config arg to help
+
+commit 42767794dc27af398cf06d6b27ce5d2f47124394
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 3 12:52:02 2012 +0000
+
+    Added --exclude-* options and configuration file
+
+commit 53530daba441a34d52f9673875884afae081f550
+Author: Nigel Kukard <nkukard@lbsd.net>
+Date:   Tue Jan 3 09:05:06 2012 +0000
+
+    Fixed license, this software is GPLv3 not v2
--- a/LICENSE
+++ b/LICENSE
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
+tar >= 1.22
+- Previous version of tar have a --null bug, dbackup does work around this
+  but tar cannot backup files with very odd filenames that contain " ' \
+
+xz
+- For best compression
+
+Compress::Zlib
+
+Config::IniFiles
--- a/dbackup
+++ b/dbackup
--- a/dbackup.conf
+++ b/dbackup.conf
+# The parameters in this file correspond to the commandline arguments
+# that can be given for the --backup option
+
+[backup]
+
+# Uncomment this to exclude system-dir's from backup
+#exclude-system=1
+
+# System bases are kernel isolated virtual machines, like chroots.
+# The system-dir's are appended to these in the tests for exclusion.
+#exclude-system-base=/
+#exclude-system-base=/vservers/my-linux-vserver
+#exclude-system-base=/chroots/my-chroot
+
+# System dirs not to backup
+#exclude-system-dir=/sys
+#exclude-system-dir=/proc
+#exclude-system-dir=/dev
+#exclude-system-dir=/tmp
--- a/debian/awit-dbackup.install
+++ b/debian/awit-dbackup.install
+dbackup usr/sbin
+
+# Config
+dbackup.conf etc
--- a/debian/awit-dbackup.manpages
+++ b/debian/awit-dbackup.manpages
+debian/dbackup.1
--- a/debian/changelog
+++ b/debian/changelog
+awit-dbackup (0.0.21-1-1) stable; urgency=low
+  * Updated to upstream v0.0.21-1
+ -- Nigel Kukard <nkukard@lbsd.net>  Mon, 09 Jun 2014 16:08:23 +0200
--- a/debian/compat
+++ b/debian/compat
+9
--- a/debian/control
+++ b/debian/control
+Source: awit-dbackup
+Maintainer: Nigel Kukard <nkukard@lbsd.net>
+Section: contrib/utils
+Priority: optional
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 9), docbook-to-man
+Homepage: http://www.dbackup.org
+
+Package: awit-dbackup
+Architecture: all
+Depends: ${perl:Depends}, ${misc:Depends},
+	xz-utils, tar (>= 1.22),
+	libcompress-zlib-perl, libconfig-inifiles-perl
+Description: Flexible one archive per directory backup tool
+ This is a backup software package which basically creates one
+ archive per directory it backs up. This makes searching
+ through the backup much easier as you can look for which files
+ you're after in the directory hierarchy. It will only backup
+ directories which have changed, which makes it rsync friendly.
+
--- a/debian/copyright
+++ b/debian/copyright
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://gitlab.devlabs.linuxassist.net/awit-dbackup/awit-dbackup
+
+Files: *
+Copyright: Copyright (C) 2010-2014, AllWorldIT
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
--- a/debian/rules
+++ b/debian/rules
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_auto_build:
+	docbook-to-man docs/dbackup.sgml > debian/dbackup.1
+	dh_auto_build
+
+override_dh_clean:
+	rm -f debian/dbackup.1
+	dh_clean
+
--- a/debian/source/format
+++ b/debian/source/format
+3.0 (quilt)
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+o091XhVdO4pes0RYYsltc/NQ/GC9
+=TvTK
+-----END PGP PUBLIC KEY BLOCK-----
--- a/debian/watch
+++ b/debian/watch
+version=3
+opts=pgpsigurlmangle=s/$/.asc/,downloadurlmangle=s/(.*)/$1\/awit-dbackup-$1\.tar\.gz/ \
+http://download.allworldit.org/awit-dbackup/v(.+)
--- a/docs/dbackup.sgml
+++ b/docs/dbackup.sgml
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>Nigel</firstname>">
+  <!ENTITY dhsurname   "<surname>Kukard</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>2012-09-28 09:29</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhemail     "<email>nkukard@lbsd.net</email>">
+  <!ENTITY dhusername  "nkukard">
+  <!ENTITY dhucpackage "<refentrytitle>DBACKUP</refentrytitle>">
+  <!ENTITY dhpackage   "dbackup">
+
+  <!ENTITY author      "Nigel Kukard">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2012</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>DBackup is a powerful per-directory backup utility.</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>--help</option></arg>
+      <arg><option>--config <replaceable>path</replaceable></option></arg>
+      <arg><option>--log-level <replaceable>level</replaceable></option></arg>
+      <arg><option>--tar <replaceable>path</replaceable></option></arg>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This is a backup software package which creates one archive per directory it backs up. This makes searching through the backup much easier as you can look for which files you're after in the directory hierarchy. It will only backup directories which have changed, which makes it rsync friendly.</para>
+  </refsect1>
+  <refsect1>
+    <title>GENERAL OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--help</option></term>
+        <listitem>
+          <para>What you're seeing now.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--config=file</option></term>
+        <listitem>
+          <para>Configuration file to use.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--log-level</option></term>
+        <listitem>
+          <para>5 = debug, 4 = info, 3 = notice, 2 = warning, 1 = error</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--tar</option></term>
+        <listitem>
+          <para>Path to tar binary.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>BACKING OPTIONS</title>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>--backup</option></term>
+        <listitem>
+          <para>Backup src to dst.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--backup-upgrade</option></term>
+        <listitem>
+          <para>Upgrade backup to new dbackup version.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--compress=&lt;xz|bz2|gzip|none&gt;</option></term>
+        <listitem>
+          <para>Compression method to use. Defaults
+            to using xz, or bzip2 if xz is unavailable.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--exclude-data</option></term>
+        <listitem>
+          <para>Exclude all data directories listed below.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--exclude-system</option></term>
+        <listitem>
+          <para>Exclude system directories listed below.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--exclude-path=pcre</option></term>
+        <listitem>
+          <para>PCRE to exclude paths from backup.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--exclude-file</option></term>
+        <listitem>
+          <para>PCRE to exclude files from backup.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--exclude-fs-type=fstype</option></term>
+        <listitem>
+          <para>Filesystem type to exclude.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--data-dir=dir</option></term>
+        <listitem>
+          <para>Add an additional data directory.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>--system-dir=dir</option></term>
+        <listitem>
+          <para>Add an additional system directory.</para>
+        </listitem>