mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

inspector: Include <hostname> in output.

Browse Source 
(cherry picked from commit 36d3a4ce53)
This commit is contained in:
Richard W.M. Jones
2011-04-14 17:58:51 +01:00
parent 0c1369f78b
commit e1015bbbc1
6 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inspector/example-debian.xml
View File

@@ -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>

1
inspector/example-fedora.xml
View File

@@ -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>

1
inspector/example-ubuntu.xml
View File

@@ -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>

1
inspector/example-windows.xml
View File

@@ -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>

8
inspector/virt-inspector.c
View File

@@ -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"))

1
inspector/virt-inspector.rng
View File

@@ -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>