X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=inspector%2Fvirt-inspector.rng;h=973bc3cce6fb24812559461838ac28f078d4d1b8;hb=refs%2Ftags%2F1.9.4;hp=1da58fc87a42f069cd9cc097a892eb2efcce2fa7;hpb=ee21bc1f8071bb35409e9f15fb8309348c9a5912;p=libguestfs.git

diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng
index 1da58fc..973bc3c 100644
--- a/inspector/virt-inspector.rng
+++ b/inspector/virt-inspector.rng
@@ -20,36 +20,36 @@
   <start>
     <element name="operatingsystems">
       <oneOrMore>
-	<element name="operatingsystem">
-	  <interleave>
-
-	    <!-- required fields for an operating system -->
-	    <element name="name">
-	      <choice>
-		<value>linux</value>
-		<value>windows</value>
-	      </choice>
-	    </element>
-	    <element name="arch"><text/></element>
-	    <element name="root"><text/></element>
-
-	    <!-- optional fields for an operating system -->
-	    <optional><element name="distro"><text/></element></optional>
-	    <optional><element name="major_version"><text/></element></optional>
-	    <optional><element name="minor_version"><text/></element></optional>
-	    <optional><element name="package_format"><text/></element></optional>
-	    <optional><element name="package_management"><text/></element></optional>
-
-	    <ref name="mountpoints"/>
-	    <ref name="filesystems"/>
-	    <optional><ref name="applications"/></optional>
-	    <optional><ref name="modprobealiases"/></optional>
-	    <optional><ref name="initrds"/></optional>
-	    <optional><ref name="kernels"/></optional>
-	    <optional><ref name="boot"/></optional>
-
-	  </interleave>
-	</element>
+        <element name="operatingsystem">
+          <interleave>
+
+            <optional><element name="root"><text/></element></optional>
+            <element name="name">
+              <choice>
+                <value>linux</value>
+                <value>windows</value>
+              </choice>
+            </element>
+            <optional><element name="arch"><text/></element></optional>
+            <optional><element name="distro"><text/></element></optional>
+            <optional><element name="product_name"><text/></element></optional>
+            <element name="major_version"><text/></element>
+            <element name="minor_version"><text/></element>
+            <optional><element name="windows_systemroot"><text/></element></optional>
+
+            <optional><element name="package_format"><text/></element></optional>
+            <optional><element name="package_management"><text/></element></optional>
+            <optional><element name="format"><text/></element></optional>
+            <optional><element name="live"><empty/></element></optional>
+            <optional><element name="netinst"><empty/></element></optional>
+            <optional><element name="multipart"><empty/></element></optional>
+
+            <ref name="mountpoints"/>
+            <ref name="filesystems"/>
+            <optional><ref name="applications"/></optional>
+
+          </interleave>
+        </element>
       </oneOrMore>
     </element>
   </start>
@@ -58,10 +58,10 @@
   <define name="mountpoints">
     <element name="mountpoints">
       <oneOrMore>
-	<element name="mountpoint">
-	  <attribute name="dev"><text/></attribute>
-	  <text/>
-	</element>
+        <element name="mountpoint">
+          <attribute name="dev"><text/></attribute>
+          <text/>
+        </element>
       </oneOrMore>
     </element>
   </define>
@@ -70,16 +70,14 @@
   <define name="filesystems">
     <element name="filesystems">
       <oneOrMore>
-	<element name="filesystem">
-	  <attribute name="dev"><text/></attribute>
-	  <interleave>
-	    <element name="type"><text/></element>
-	    <optional><element name="content"><text/></element></optional>
-	    <optional><element name="label"><text/></element></optional>
-	    <optional><element name="uuid"><text/></element></optional>
-	    <optional><element name="spec"><text/></element></optional>
-	  </interleave>
-	</element>
+        <element name="filesystem">
+          <attribute name="dev"><text/></attribute>
+          <interleave>
+            <optional><element name="type"><text/></element></optional>
+            <optional><element name="label"><text/></element></optional>
+            <optional><element name="uuid"><text/></element></optional>
+          </interleave>
+        </element>
       </oneOrMore>
     </element>
   </define>
@@ -88,79 +86,19 @@
   <define name="applications">
     <element name="applications">
       <zeroOrMore>
-	<element name="application">
-	  <element name="name"><text/></element>
-	  <element name="version"><text/></element>
-	</element>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <!-- contents of /etc/modprobe* -->
-  <define name="modprobealiases">
-    <element name="modprobealiases">
-      <zeroOrMore>
-	<element name="alias">
-	  <attribute name="device"><text/></attribute>
-	  <interleave>
-	    <element name="modulename"><text/></element>
-	    <optional><element name="augeas"><text/></element></optional>
-	    <element name="file"><text/></element>
-	  </interleave>
-	</element>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <!-- initrd images found -->
-  <define name="initrds">
-    <element name="initrds">
-      <zeroOrMore>
-	<element name="initrd">
-	  <attribute name="version"><text/></attribute>
-	  <zeroOrMore>
-	    <element name="module"><text/></element>
-	  </zeroOrMore>
-	</element>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <!-- boot configurations -->
-  <define name="boot">
-    <element name="boot">
-      <zeroOrMore>
-	<element name="config">
-	  <optional>
-	    <attribute name="default"><value>1</value></attribute>
-	  </optional>
-	  <interleave>
-	    <element name="title"><text/></element>
-	    <element name="kernel"><text/></element>
-	    <element name="cmdline"><text/></element>
-	  </interleave>
-	</element>
-      </zeroOrMore>
-    </element>
-  </define>
-
-  <!-- kernels -->
-  <define name="kernels">
-    <element name="kernels">
-      <zeroOrMore>
-	<element name="kernel">
-	  <attribute name="version"><text/></attribute>
-	  <attribute name="arch"><text/></attribute>
-	  <interleave>
-	    <element name="modules">
-	      <zeroOrMore>
-		<element name="module"><text/></element>
-	      </zeroOrMore>
-	    </element>
-	    <optional><element name="path"><text/></element></optional>
-	    <optional><element name="package"><text/></element></optional>
-	  </interleave>
-	</element>
+        <element name="application">
+          <element name="name"><text/></element>
+          <optional><element name="display_name"><text/></element></optional>
+          <optional><element name="epoch"><text/></element></optional>
+          <optional><element name="version"><text/></element></optional>
+          <optional><element name="release"><text/></element></optional>
+          <optional><element name="install_path"><text/></element></optional>
+          <optional><element name="publisher"><text/></element></optional>
+          <optional><element name="url"><text/></element></optional>
+          <optional><element name="source_package"><text/></element></optional>
+          <optional><element name="summary"><text/></element></optional>
+          <optional><element name="description"><text/></element></optional>
+        </element>
       </zeroOrMore>
     </element>
   </define>