diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-09-02 11:17:24 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-09-02 11:17:24 -0500 |
| commit | 1473ce86eceebc4ef8ba1f77d1d7c326a7bebad9 (patch) | |
| tree | 4be8e2f6b528bb0e49d472883b2969915dbaa5c4 | |
| parent | d412772eed161a8d13edfacabcd1ff4c00558124 (diff) | |
| download | bcfg2-1473ce86eceebc4ef8ba1f77d1d7c326a7bebad9.tar.gz bcfg2-1473ce86eceebc4ef8ba1f77d1d7c326a7bebad9.tar.bz2 bcfg2-1473ce86eceebc4ef8ba1f77d1d7c326a7bebad9.zip | |
POSIX/Device: Change perms back to mode
Change our terminology to match that used by MKNOD(1). This makes the
client tool behave as it did previously. Also, add 'mode' to the schema
to make `bcfg2-lint` happy.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | doc/server/plugins/generators/rules.txt | 2 | ||||
| -rw-r--r-- | schemas/types.xsd | 1 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/POSIX/Device.py | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt index 107ec148a..782ad290d 100644 --- a/doc/server/plugins/generators/rules.txt +++ b/doc/server/plugins/generators/rules.txt @@ -248,6 +248,8 @@ device +-----------+---------------------+-------------------+ | group | Device group | String | +-----------+---------------------+-------------------+ +| mode | Mode for the device | String | ++-----------+---------------------+-------------------+ | secontext | SELinux context | String | +-----------+---------------------+-------------------+ | major | Major number (block | integer | diff --git a/schemas/types.xsd b/schemas/types.xsd index edbc8ad37..7f0c7829a 100644 --- a/schemas/types.xsd +++ b/schemas/types.xsd @@ -140,6 +140,7 @@ <xsd:attribute type="DeviceTypeEnum" name="dev_type"/> <xsd:attribute type="xsd:integer" name="major"/> <xsd:attribute type="xsd:integer" name="minor"/> + <xsd:attribute type="xsd:integer" name="mode"/> <xsd:attribute type="xsd:string" name="perms"/> <xsd:attribute type="xsd:string" name="owner"/> <xsd:attribute type="xsd:string" name="group"/> diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py index 0ea4128f7..f40df38f3 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIX/Device.py +++ b/src/lib/Bcfg2/Client/Tools/POSIX/Device.py @@ -7,7 +7,7 @@ except ImportError: exec("from .base import POSIXTool, device_map") class POSIXDevice(POSIXTool): - __req__ = ['name', 'dev_type', 'perms', 'owner', 'group'] + __req__ = ['name', 'dev_type', 'mode', 'owner', 'group'] def fully_specified(self, entry): if entry.get('dev_type') in ['block', 'char']: @@ -50,7 +50,7 @@ class POSIXDevice(POSIXTool): if not self._exists(entry, remove=True): try: dev_type = entry.get('dev_type') - mode = device_map[dev_type] | int(entry.get('perms'), 8) + mode = device_map[dev_type] | int(entry.get('mode'), 8) if dev_type in ['block', 'char']: major = int(entry.get('major')) minor = int(entry.get('minor')) |