summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-10-15 14:23:20 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-10-15 14:23:20 -0500
commit92509f22ef81e86bc5443d879ac974f1e0784f72 (patch)
tree0e6f3c15f4564daead65fd4b420e56f76435c626
parente78fbc567240f1c0d618524b3497740cb989783f (diff)
downloadbcfg2-92509f22ef81e86bc5443d879ac974f1e0784f72.tar.gz
bcfg2-92509f22ef81e86bc5443d879ac974f1e0784f72.tar.bz2
bcfg2-92509f22ef81e86bc5443d879ac974f1e0784f72.zip
Options: Update mdata option to use 'mode'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--man/bcfg2.conf.52
-rw-r--r--src/lib/Bcfg2/Options.py6
-rw-r--r--tools/manpagegen/bcfg2.conf.5.ronn2
3 files changed, 5 insertions, 5 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 33c5d83f8..da7022a07 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -297,7 +297,7 @@ Global owner for Paths (defaults to root)
Global group for Paths (defaults to root)
.
.TP
-\fBperms\fR
+\fBmode\fR
Global permissions for Paths (defaults to 644)
.
.TP
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index f20f0dce9..5bfcec72c 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -473,10 +473,10 @@ MDATA_IMPORTANT = \
odesc='Important entries are installed first',
cf=('mdata', 'important'))
MDATA_PERMS = \
- Option('Default Path permissions',
+ Option('Default mode for Path',
default='644',
- odesc='octal permissions',
- cf=('mdata', 'perms'))
+ odesc='octal file mode',
+ cf=('mdata', 'mode'))
MDATA_SECONTEXT = \
Option('Default SELinux context',
default='__default__',
diff --git a/tools/manpagegen/bcfg2.conf.5.ronn b/tools/manpagegen/bcfg2.conf.5.ronn
index b559f5599..ca216a433 100644
--- a/tools/manpagegen/bcfg2.conf.5.ronn
+++ b/tools/manpagegen/bcfg2.conf.5.ronn
@@ -426,7 +426,7 @@ metadata settings for Paths with type=’file’.
* `group`:
Global group for Paths (defaults to root)
- * `perms`:
+ * `mode`:
Global permissions for Paths (defaults to 644)
* `secontext`: