diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2011-04-14 17:58:51 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2011-04-14 18:20:26 +0100 |
| commit | 36d3a4ce53317b104d48b60c9fe1ed679065d1d4 (patch) | |
| tree | 397b0c55613c52943b5d2b71cd10be049acbaf98 /inspector | |
| parent | d95874db3dc6c415061b86275d03770b4f28ffbb (diff) | |
| download | libguestfs-36d3a4ce53317b104d48b60c9fe1ed679065d1d4.tar.gz libguestfs-36d3a4ce53317b104d48b60c9fe1ed679065d1d4.tar.xz libguestfs-36d3a4ce53317b104d48b60c9fe1ed679065d1d4.zip | |
inspector: Include <hostname> in output.
Diffstat (limited to 'inspector')
| -rw-r--r-- | inspector/example-debian.xml | 1 | ||||
| -rw-r--r-- | inspector/example-fedora.xml | 1 | ||||
| -rw-r--r-- | inspector/example-ubuntu.xml | 1 | ||||
| -rw-r--r-- | inspector/example-windows.xml | 1 | ||||
| -rw-r--r-- | inspector/virt-inspector.c | 8 | ||||
| -rw-r--r-- | inspector/virt-inspector.rng | 1 |
6 files changed, 13 insertions, 0 deletions
diff --git a/inspector/example-debian.xml b/inspector/example-debian.xml index c699d77a..5b60092e 100644 --- a/inspector/example-debian.xml +++ b/inspector/example-debian.xml @@ -10,6 +10,7 @@ <minor_version>0</minor_version> <package_format>deb</package_format> <package_management>apt</package_management> + <hostname>debian.invalid</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev/debian/root">/</mountpoint> diff --git a/inspector/example-fedora.xml b/inspector/example-fedora.xml index 1444bb74..4c01a20b 100644 --- a/inspector/example-fedora.xml +++ b/inspector/example-fedora.xml @@ -10,6 +10,7 @@ <minor_version>0</minor_version> <package_format>rpm</package_format> <package_management>yum</package_management> + <hostname>fedora.invalid</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev/VG/Root">/</mountpoint> diff --git a/inspector/example-ubuntu.xml b/inspector/example-ubuntu.xml index 61697814..ab08b0cf 100644 --- a/inspector/example-ubuntu.xml +++ b/inspector/example-ubuntu.xml @@ -10,6 +10,7 @@ <minor_version>10</minor_version> <package_format>deb</package_format> <package_management>apt</package_management> + <hostname>ubuntu.invalid</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev/sda2">/</mountpoint> diff --git a/inspector/example-windows.xml b/inspector/example-windows.xml index 8b3b8a70..55b11df4 100644 --- a/inspector/example-windows.xml +++ b/inspector/example-windows.xml @@ -11,6 +11,7 @@ <minor_version>1</minor_version> <windows_systemroot>/Windows</windows_systemroot> <windows_current_control_set>ControlSet001</windows_current_control_set> + <hostname>windows.invalid</hostname> <format>installed</format> <mountpoints> <mountpoint dev="/dev/sda2">/</mountpoint> diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c index 69c4ea9a..607e5ae0 100644 --- a/inspector/virt-inspector.c +++ b/inspector/virt-inspector.c @@ -428,6 +428,14 @@ output_root (xmlTextWriterPtr xo, char *root) free (str); ); + str = guestfs_inspect_get_hostname (g, root); + if (!str) exit (EXIT_FAILURE); + if (STRNEQ (str, "unknown")) + XMLERROR (-1, + xmlTextWriterWriteElement (xo, BAD_CAST "hostname", + BAD_CAST str)); + free (str); + str = guestfs_inspect_get_format (g, root); if (!str) exit (EXIT_FAILURE); if (STRNEQ (str, "unknown")) diff --git a/inspector/virt-inspector.rng b/inspector/virt-inspector.rng index 669e8bc6..f59311c0 100644 --- a/inspector/virt-inspector.rng +++ b/inspector/virt-inspector.rng @@ -40,6 +40,7 @@ <optional><element name="windows_current_control_set"><text/></element></optional> <optional><element name="package_format"><text/></element></optional> <optional><element name="package_management"><text/></element></optional> + <optional><element name="hostname"><text/></element></optional> <optional><element name="format"><text/></element></optional> <optional><element name="live"><empty/></element></optional> <optional><element name="netinst"><empty/></element></optional> |