X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconf%2Flustre.dtd;h=360f4a03b45171e7e3cc1e2251f00522f1f176dc;hb=89822479bba6deba3fb4a587f94b72f9bc1b0d2a;hp=96fdc8ec5035e7eeef130249a913afb8409fea37;hpb=9570cac99cb852d8c0ba0694e8b4d33e32539775;p=fs%2Flustre-release.git

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 96fdc8e..360f4a0 100644
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -21,22 +21,23 @@
                
 <!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
 <!ATTLIST network %object.attr;
-                  nettype (tcp | elan | gm | scimac) 'tcp'>
+                  nettype (tcp | elan | gm) 'tcp'>
 
 <!ELEMENT routetbl (route)*>
 <!ATTLIST routetbl %object.attr;>
 <!ELEMENT route %object.content;>
-<!ATTLIST route type (elan | tcp | gm | scimac) #REQUIRED
+<!ATTLIST route type (elan | tcp | gm) #REQUIRED
                 gw CDATA #REQUIRED
                 lo CDATA #REQUIRED
                 hi CDATA #IMPLIED >
 
 <!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
                    osd_ref | mdsdev_ref | lovconfig_ref|
-                   echoclient_ref | mountpoint_ref | mgmt_ref)*>
+                   echoclient_ref | mountpoint_ref)*>
 <!ATTLIST profile %object.attr;>
 
 <!ELEMENT mountpoint path #REQUIRED
+                     clientoptions #REQUIRED >
                      filesystem_ref #REQUIRED >
 <!ATTLIST mountpoint %object.attr;>
 
@@ -46,14 +47,11 @@
 <!ELEMENT ldlm EMPTY>
 <!ATTLIST ldlm %object.attr;>
 
-<!ELEMENT mgmt (active_ref)*>
-<!ATTLIST mgmt %object.attr;>
-
 <!ELEMENT ptlrpc EMPTY>
 <!ATTLIST ptlrpc %object.attr;>
 
 <!ELEMENT osd (fstype | devpath | devsize | autoformat | 
-               target_ref | node_ref | journalsize )*>
+               target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST osd %object.attr; 
               osdtype (obdfilter | obdecho) 'obdfilter'>
 
@@ -62,8 +60,7 @@
               failover ( 1 | 0 ) #IMPLIED>
 
 <!ELEMENT filesystem mds_ref #REQUIRED
-                     obd_ref #REQUIRED
-                     (mgmt_ref)* >
+                     obd_ref #REQUIRED>
 <!ATTLIST filesystem %object.attr;>
 
 <!ELEMENT mds (active_ref | lovconfig_ref | group)*>
@@ -71,7 +68,7 @@
               failover ( 1 | 0 ) #IMPLIED>
 
 <!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
-                  target_ref | node_ref | journalsize )*>
+                  target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
 <!ATTLIST mdsdev %object.attr;>
 
 <!ELEMENT lov (mds_ref |(obd_ref)+)*>
@@ -90,6 +87,9 @@
 <!ELEMENT ptldebug      %object.content;>
 <!ELEMENT subsystem     %object.content;>
 <!ELEMENT journalsize   %object.content;>
+<!ELEMENT mkfsoptions   %object.content;>
+<!ELEMENT mountfsoptions %object.content;>
+<!ELEMENT clientoptions %object.content;>
 <!ELEMENT fstype        %object.content;>
 <!ELEMENT nid           %object.content;>
 <!ELEMENT port          %object.content;>
@@ -129,8 +129,6 @@
 <!ATTLIST lov_ref         %objref.attr;>
 <!ELEMENT lovconfig_ref   %objref.content;>
 <!ATTLIST lovconfig_ref   %objref.attr;>
-<!ELEMENT mgmt_ref        %objref.content;>
-<!ATTLIST mgmt_ref        %objref.attr;>
 <!ELEMENT mountpoint_ref  %objref.content;>
 <!ATTLIST mountpoint_ref  %objref.attr;>
 <!ELEMENT filesystem_ref  %objref.content;>