diff options
| -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')) |