git.annexia.org
/
libguestfs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d95874d
)
inspector: Include <hostname> in output.
author
Richard W.M. Jones
<rjones@redhat.com>
Thu, 14 Apr 2011 16:58:51 +0000
(17:58 +0100)
committer
Richard W.M. Jones
<rjones@redhat.com>
Thu, 14 Apr 2011 17:20:26 +0000
(18:20 +0100)
inspector/example-debian.xml
patch
|
blob
|
history
inspector/example-fedora.xml
patch
|
blob
|
history
inspector/example-ubuntu.xml
patch
|
blob
|
history
inspector/example-windows.xml
patch
|
blob
|
history
inspector/virt-inspector.c
patch
|
blob
|
history
inspector/virt-inspector.rng
patch
|
blob
|
history
diff --git
a/inspector/example-debian.xml
b/inspector/example-debian.xml
index
c699d77
..
5b60092
100644
(file)
--- 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>
<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>
<format>installed</format>
<mountpoints>
<mountpoint dev="/dev/debian/root">/</mountpoint>
diff --git
a/inspector/example-fedora.xml
b/inspector/example-fedora.xml
index
1444bb7
..
4c01a20
100644
(file)
--- 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>
<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>
<format>installed</format>
<mountpoints>
<mountpoint dev="/dev/VG/Root">/</mountpoint>
diff --git
a/inspector/example-ubuntu.xml
b/inspector/example-ubuntu.xml
index
6169781
..
ab08b0c
100644
(file)
--- 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>
<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>
<format>installed</format>
<mountpoints>
<mountpoint dev="/dev/sda2">/</mountpoint>
diff --git
a/inspector/example-windows.xml
b/inspector/example-windows.xml
index
8b3b8a7
..
55b11df
100644
(file)
--- 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>
<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>
<format>installed</format>
<mountpoints>
<mountpoint dev="/dev/sda2">/</mountpoint>
diff --git
a/inspector/virt-inspector.c
b/inspector/virt-inspector.c
index
69c4ea9
..
607e5ae
100644
(file)
--- a/
inspector/virt-inspector.c
+++ b/
inspector/virt-inspector.c
@@
-428,6
+428,14
@@
output_root (xmlTextWriterPtr xo, char *root)
free (str);
);
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"))
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
669e8bc
..
f59311c
100644
(file)
--- 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="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>
<optional><element name="format"><text/></element></optional>
<optional><element name="live"><empty/></element></optional>
<optional><element name="netinst"><empty/></element></optional>