* llrmount.sh now uses lconf

[fs/lustre-release.git] / lustre / utils / lustre.dtd

diff --git a/lustre/utils/lustre.dtd b/lustre/utils/lustre.dtd
index 49f3faa..a16b7c5 100644 (file)
--- a/lustre/utils/lustre.dtd
+++ b/lustre/utils/lustre.dtd
@@ -11,14 +11,15 @@
   uuid CDATA #REQUIRED">\r
 \r
 <!-- main elements -->\r
-<!ELEMENT lustre (node | profile | mountpoint | ldlm |\r
+<!ELEMENT lustre (node | mountpoint | ldlm |\r
                   mds | mdc | obd | ost | osc | lov | router)*>\r
 \r
-<!ELEMENT profile (service_ref)*>\r
-<!ATTLIST profile %tag.attr;>\r
+<!ELEMENT profile (ldlm_ref | network_ref | obd_ref | ost_ref | osc_ref |\r
+                   mds_ref | mdc_ref | lov_ref | mountpoint_ref)*>\r
+<!ATTLIST profile >\r
 <!ELEMENT mountpoint (path | fileset | mdc_ref | osc_ref)*>\r
 <!ATTLIST mountpoint %tag.attr;>\r
-<!ELEMENT node (network*, profile_ref)>\r
+<!ELEMENT node (network | profile)*>\r
 <!ATTLIST node %tag.attr;>\r
 <!ELEMENT ldlm EMPTY>\r
 <!ATTLIST ldlm %tag.attr;>\r
@@ -27,14 +28,15 @@
 <!ATTLIST obd %tag.attr; type (obdfilter | obdext2 | obdecho) 'obdfilter'>\r
 <!ELEMENT ost (network_ref | obd_ref | failover_ref)*>\r
 <!ATTLIST ost %tag.attr;>\r
-<!ELEMENT mds (network_ref | fstype | device | autoformat | server_ref | failover_ref)*>\r
+<!ELEMENT mds (network_ref | fstype | device | autoformat | \r
+               server_ref | failover_ref | node_ref )*>\r
 <!ATTLIST mds %tag.attr;>\r
 \r
-<!ELEMENT osc (network_ref | obd_ref)*>\r
+<!ELEMENT osc (ost_ref | obd_ref)*>\r
 <!ATTLIST osc %tag.attr;>\r
 <!ELEMENT mdc (network_ref | mds_ref)*>\r
 <!ATTLIST mdc %tag.attr;>\r
-<!ELEMENT lov (devices | mdc_ref)*>\r
+<!ELEMENT lov (devices | mds_ref)*>\r
 <!ATTLIST lov %tag.attr;>\r
 <!ELEMENT devices (osc_ref)+>\r
 <!ATTLIST devices stripesize CDATA #REQUIRED\r
@@ -60,6 +62,8 @@
 <!-- id tag elements -->\r
 <!ELEMENT network_ref    %tag.content;>\r
 <!ATTLIST network_ref    %tag.ref;>\r
+<!ELEMENT node_ref       %tag.content;>\r
+<!ATTLIST node_ref       %tag.ref;>\r
 <!ELEMENT profile_ref    %tag.content;>\r
 <!ATTLIST profile_ref    %tag.ref;>\r
 <!ELEMENT obd_ref        %tag.content;>\r
@@ -68,16 +72,17 @@
 <!ATTLIST mds_ref        %tag.ref;>\r
 <!ELEMENT osc_ref        %tag.content;>\r
 <!ATTLIST osc_ref        %tag.ref;>\r
+<!ELEMENT ost_ref        %tag.content;>\r
+<!ATTLIST ost_ref        %tag.ref;>\r
 <!ELEMENT lov_ref        %tag.content;>\r
 <!ATTLIST lov_ref        %tag.ref;>\r
 <!ELEMENT mdc_ref        %tag.content;>\r
 <!ATTLIST mdc_ref        %tag.ref;>\r
 <!ELEMENT mountpoint_ref %tag.content;>\r
 <!ATTLIST mountpoint_ref %tag.ref;>\r
-<!ELEMENT service_ref    %tag.content;>\r
-<!ATTLIST service_ref    %tag.ref;>\r
 <!ELEMENT server_ref     %tag.content;>\r
 <!ATTLIST server_ref     %tag.ref;>\r
 <!ELEMENT failover_ref   %tag.content;>\r
 <!ATTLIST failover_ref   %tag.ref;>\r
-\r
+<!ELEMENT ldlm_ref   %tag.content;>\r
+<!ATTLIST ldlm_ref   %tag.ref;>\r