summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-10-14 05:30:23 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-10-14 05:30:23 -0500
commit17e5051d616caca3974ba8662b7cc9441621c2e9 (patch)
tree246a9639a76662726d9cf85c98c1ab9c5b0ca28d
parent7adaa9488f53cdd73123682e7ad0cd6544eef361 (diff)
parent73037d1f2a193b61fd59724ce81760bfe2f50348 (diff)
downloadbcfg2-17e5051d616caca3974ba8662b7cc9441621c2e9.tar.gz
bcfg2-17e5051d616caca3974ba8662b7cc9441621c2e9.tar.bz2
bcfg2-17e5051d616caca3974ba8662b7cc9441621c2e9.zip
Merge branch 'doc-packages-backends' of https://github.com/AlexanderS/bcfg2
-rw-r--r--doc/man/bcfg2.conf.txt4
-rw-r--r--doc/server/plugins/generators/packages.txt3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 9e5da3eb9..8bfcaca69 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -537,6 +537,10 @@ Packages options
The following options are specified in the **[packages]** section.
+ backends
+ Comma separated list of backends for the dependency resolution.
+ Default is "Yum,Apt,Pac,Pkgng".
+
resolver
Enable dependency resolution. Default is 1 (true).
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index 62cf06eaf..2fe71f895 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -717,6 +717,9 @@ It understands the following directives:
+-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
| Name | Description | Values | Default |
+=============+======================================================+==========+===================================================================+
+| backends | List of backends that should be loaded for the | List | Yum,Apt,Pac,Pkgng |
+| | dependency resolution. | | |
++-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
| resolver | Enable dependency resolution | Boolean | True |
+-------------+------------------------------------------------------+----------+-------------------------------------------------------------------+
| metadata | Enable metadata processing. Disabling ``metadata`` | Boolean | True |