summaryrefslogtreecommitdiffstats
path: root/schemas
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-10-01 16:47:07 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-10-01 16:47:07 +0000
commit3cd34d135d6f3705862f0d1625c06a1669ec0023 (patch)
tree59b2318ff469544f85d568b2bfac5a4d113e6fc7 /schemas
parent3b729603e422786b9d44fee50f2ec255503d1d43 (diff)
downloadbcfg2-3cd34d135d6f3705862f0d1625c06a1669ec0023.tar.gz
bcfg2-3cd34d135d6f3705862f0d1625c06a1669ec0023.tar.bz2
bcfg2-3cd34d135d6f3705862f0d1625c06a1669ec0023.zip
POSIX: Add block/character/fifo devices (ticket #477)
This commit adds support for posix device types via Path entries in Bundler. The 'type' attribute for Path entries is now all lowercase. Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5470 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'schemas')
-rw-r--r--schemas/pathentry.xsd3
-rw-r--r--schemas/rules.xsd13
-rw-r--r--schemas/types.xsd2
3 files changed, 14 insertions, 4 deletions
diff --git a/schemas/pathentry.xsd b/schemas/pathentry.xsd
index 5e129fa75..7be0e37e2 100644
--- a/schemas/pathentry.xsd
+++ b/schemas/pathentry.xsd
@@ -8,10 +8,7 @@
</xsd:documentation>
</xsd:annotation>
- <xsd:include schemaLocation="types.xsd"/>
-
<xsd:complexType name='PathEntry'>
<xsd:attribute type='xsd:string' name='name' use='required'/>
- <xsd:attribute name='type' use='required' type='PathTypeEnum' />
</xsd:complexType>
</xsd:schema>
diff --git a/schemas/rules.xsd b/schemas/rules.xsd
index 0baa1e25f..d9b99d63d 100644
--- a/schemas/rules.xsd
+++ b/schemas/rules.xsd
@@ -33,6 +33,18 @@
<xsd:attribute type='xsd:string' name='to' use='required'/>
</xsd:complexType>
+ <xsd:complexType name='PathType'>
+ <xsd:attribute type='PathTypeEnum' name='type' use='required'/>
+ <xsd:attribute type='xsd:string' name='name' use='required'/>
+ <xsd:attribute type='xsd:string' name='dev_type'/>
+ <xsd:attribute type='xsd:string' name='major'/>
+ <xsd:attribute type='xsd:string' name='minor'/>
+ <xsd:attribute type='xsd:string' name='mode'/>
+ <xsd:attribute type='xsd:string' name='perms'/>
+ <xsd:attribute type='xsd:string' name='owner'/>
+ <xsd:attribute type='xsd:string' name='group'/>
+ </xsd:complexType>
+
<xsd:complexType name='PermissionsType'>
<xsd:attribute type='xsd:string' name='name' use='required'/>
<xsd:attribute type='xsd:string' name='perms' use='required'/>
@@ -63,6 +75,7 @@
<xsd:element name='Directory' type='DirectoryType'/>
<xsd:element name='SymLink' type='SymLinkType'/>
<xsd:element name='Package' type='PackageType'/>
+ <xsd:element name='Path' type='PathType'/>
<xsd:element name='Permissions' type='PermissionsType'/>
<xsd:element name='Action' type='ActionType'/>
<xsd:element name='Group' type='RContainerType'/>
diff --git a/schemas/types.xsd b/schemas/types.xsd
index db85bbaab..f04c3140f 100644
--- a/schemas/types.xsd
+++ b/schemas/types.xsd
@@ -24,7 +24,7 @@
<xsd:simpleType name='PathTypeEnum'>
<xsd:restriction base='xsd:string'>
<xsd:enumeration value='ConfigFile' />
- <xsd:enumeration value='Device' />
+ <xsd:enumeration value='device' />
<xsd:enumeration value='Directory' />
<xsd:enumeration value='HardLink' />
<xsd:enumeration value='Perms' />