diff options
author | Richard W.M. Jones <rjones@redhat.com> | 2010-10-28 11:31:23 +0100 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2010-10-28 15:48:12 +0100 |
commit | f30210cba89763a32cfbcbfd68ccfcec8d5300e4 (patch) | |
tree | a483085cba59cc67734f691fa212c15532dff5bc /inspector/virt-inspector.rng | |
parent | ca7e941329b31d1bffc8cae9dca6d28b06ecc300 (diff) | |
download | libguestfs-f30210cba89763a32cfbcbfd68ccfcec8d5300e4.tar.gz libguestfs-f30210cba89763a32cfbcbfd68ccfcec8d5300e4.tar.xz libguestfs-f30210cba89763a32cfbcbfd68ccfcec8d5300e4.zip |
inspector: Rewrite virt-inspector (RHBZ#642930).
Rewrite virt-inspector:
- remove old and unsupportable features
- use the C inspection API
- don't run programs from the guest
The RNG has been updated to reflect the new XML-only output.
The new example files show the new XML output.
Diffstat (limited to 'inspector/virt-inspector.rng')
-rw-r--r-- | inspector/virt-inspector.rng | 92 |
1 files changed, 6 insertions, 86 deletions
diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index 2b1b5b44..835245e0 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -23,7 +23,7 @@ <element name="operatingsystem"> <interleave> - <!-- required fields for an operating system --> + <optional><element name="root"><text/></element></optional> <element name="name"> <choice> <value>linux</value> @@ -31,23 +31,18 @@ </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="product_name"><text/></element></optional> - <optional><element name="major_version"><text/></element></optional> - <optional><element name="minor_version"><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> <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> @@ -74,11 +69,9 @@ <element name="filesystem"> <attribute name="dev"><text/></attribute> <interleave> - <element name="type"><text/></element> - <optional><element name="content"><text/></element></optional> + <optional><element name="type"><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> </oneOrMore> @@ -91,79 +84,6 @@ <zeroOrMore> <element name="application"> <element name="name"><text/></element> - <optional><element name="epoch"><text/></element></optional> - <element name="version"><text/></element> - <element name="release"><text/></element> - <element name="arch"><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> </zeroOrMore> </element> |