From 8a70dbabd08308403ad8296979f50c379c707df9 Mon Sep 17 00:00:00 2001
From: Sol Jerome <sol.jerome@gmail.com>
Date: Mon, 18 Oct 2010 11:43:37 -0500
Subject: POSIX: Remove client-side support for old POSIX types

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
---
 src/sbin/bcfg2-repo-validate | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

(limited to 'src/sbin/bcfg2-repo-validate')

diff --git a/src/sbin/bcfg2-repo-validate b/src/sbin/bcfg2-repo-validate
index 1889c9892..3d5efb093 100755
--- a/src/sbin/bcfg2-repo-validate
+++ b/src/sbin/bcfg2-repo-validate
@@ -88,14 +88,14 @@ if __name__ == '__main__':
     # (as defined in doc/server/configurationentries)
     # TODO: See if it is possible to do this in the schema instead
     required_configuration_attrs = {
-            'device':['name', 'owner', 'group', 'dev_type'],
-            'directory':['name', 'owner', 'group', 'perms'],
-            'file':['name', 'owner', 'group', 'perms'],
-            'hardlink':['name', 'to'],
-            'symlink':['name', 'to'],
-            'ignore':['name'],
-            'nonexist':['name'],
-            'permissions':['name', 'owner', 'group', 'perms']}
+        'device': ['name', 'owner', 'group', 'dev_type'],
+        'directory': ['name', 'owner', 'group', 'perms'],
+        'file': ['name', 'owner', 'group', 'perms'],
+        'hardlink': ['name', 'to'],
+        'symlink': ['name', 'to'],
+        'ignore': ['name'],
+        'nonexist': ['name'],
+        'permissions': ['name', 'owner', 'group', 'perms']}
     for rfile in rules_list:
         try:
             xdata = lxml.etree.parse(rfile)
@@ -110,6 +110,11 @@ if __name__ == '__main__':
                                      + ['type'])
             except KeyError:
                 continue
+            if 'dev_type' in required_attrs:
+                dev_type = posixpath.get('dev_type')
+                if dev_type in ['block', 'char']:
+                    # check if major/minor are specified
+                    required_attrs |= set(['major', 'minor'])
             if pathset.issuperset(required_attrs):
                 continue
             else:
@@ -146,16 +151,16 @@ if __name__ == '__main__':
             else:
                 pset.add(ptuple)
 
-    filesets = {'metadata':(metadata_list, "%s/metadata.xsd"),
-                'clients':(clients_list, "%s/clients.xsd"),
-                'info':(info_list, "%s/info.xsd"),
-                'bundle':(bundle_list, "%s/bundle.xsd"),
-                'pkglist':(pkg_list, "%s/pkglist.xsd"),
-                'base':(base_list, "%s/base.xsd"),
-                'rules':(rules_list, "%s/rules.xsd"),
-                'imageinfo':(imageinfo_list, "%s/report-configuration.xsd"),
-                'services':(services_list, "%s/services.xsd"),
-                'deps':(deps_list, "%s/deps.xsd"),
+    filesets = {'metadata': (metadata_list, "%s/metadata.xsd"),
+                'clients': (clients_list, "%s/clients.xsd"),
+                'info': (info_list, "%s/info.xsd"),
+                'bundle': (bundle_list, "%s/bundle.xsd"),
+                'pkglist': (pkg_list, "%s/pkglist.xsd"),
+                'base': (base_list, "%s/base.xsd"),
+                'rules': (rules_list, "%s/rules.xsd"),
+                'imageinfo': (imageinfo_list, "%s/report-configuration.xsd"),
+                'services': (services_list, "%s/services.xsd"),
+                'deps': (deps_list, "%s/deps.xsd"),
                 'decisions': (dec_list, "%s/decisions.xsd"),
                 'packages': (pkgcfg_list, "%s/packages.xsd"),
                 'grouppatterns': (gp_list, "%s/grouppatterns.xsd"),
-- 
cgit v1.2.3-1-g7c22