Allow migration to nfs4 home mount style

bin/xymon-home.py

@@ -13,7 +13,7 @@ import dphysldap
 import pyxymon as pymon
 
 CHECK_NAME = 'permissions'
-CHECK_VERSION = 5
+CHECK_VERSION = 6
 LIFETIME = 30
 
 home_dir = '/export/home1/*'
@@ -153,8 +153,13 @@ def check_homes(top):
             no_ldap_user.append(home)
 
         if home.name in nis_homes:
-            if nis_homes[home.name].split(':', maxsplit=1)[1] != home.path:
-                bad_nis_map.append(': '.join([home.name, nis_homes[home.name]]))
+            nis_home_path = nis_homes[home.name].split(':', maxsplit=1)[1]
+            if nis_home_path.startswith('/export'):
+                if nis_home_path != home.path:
+                    bad_nis_map.append(': '.join([home.name, nis_homes[home.name]]))
+            else:
+                if nis_home_path != home.path[7:]:
+                    bad_nis_map.append(': '.join([home.name, nis_homes[home.name]]))
             del nis_homes[home.name]
         else:
             no_nis_map.append(home)