client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py | 4 ++++ java/code/src/com/redhat/rhn/domain/server/Device.java | 1 + java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 2 +- java/spacewalk-java.spec | 8 +++++++- rel-eng/packages/spacewalk-java | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-)
New commits: commit eb0d0f8f775f2c027348604980aa4614a073a478 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 21 13:46:33 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.63-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 1e4dc55..697b49c 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.6.62 +Version: 1.6.63 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -557,6 +557,12 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Fri Oct 21 2011 Miroslav Suchý 1.6.63-1 +- 627809 - write out storage devices if *storage* device list is not empty +- 627809 - send xen virtual block devices to rhnParent +- 736381,732091 - adding api doc (tlestach@redhat.com) +- 680489 - fix api doc (tlestach@redhat.com) + * Mon Oct 17 2011 Michael Mraka michael.mraka@redhat.com 1.6.62-1 - 746090 - fixed join condition in query - 589799 - omit number of selected items for SSM related system selections diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index aa3b808..0ef2228 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.6.62-1 java/ +1.6.63-1 java/
commit f5148d606f46e2fcbdfc740a79b94b2e7cd3ca68 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 21 13:44:26 2011 +0200
627809 - write out storage devices if *storage* device list is not empty
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp index 04405f9..248cc4c 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp @@ -235,7 +235,7 @@ </c:forEach> </table>
- <c:if test="${not empty videoDevices}"> + <c:if test="${not empty storageDevices}"> <h2><bean:message key="sdc.details.hardware.storage"/></h2> <table class="list" width="90%" cellspacing="0"> <thead>
commit a20dd4c8f3541eed04eb2e6a711ff1e690ffc715 Author: Miroslav Suchý msuchy@redhat.com Date: Fri Oct 21 13:42:01 2011 +0200
627809 - send xen virtual block devices to rhnParent
XEN virtual block devices looks like:
/org/freedesktop/Hal/devices/xen_vbd_51713 CLASS: None info.bus ==> xen xen.type ==> vbd linux.hotplug_type ==> 0x1 info.parent ==> /org/freedesktop/Hal/devices/computer linux.sysfs_path_device ==> /sys/devices/xen/vbd-51713 linux.sysfs_path ==> /sys/devices/xen/vbd-51713 xen.path ==> device/vbd/51713 info.product ==> Xen Virtual Block Device xen.bus_id ==> vbd-51713 info.udi ==> /org/freedesktop/Hal/devices/xen_vbd_51713 info.linux.driver ==> vbd linux.subsystem ==> xen
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py index 73a606c..e3dd872 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware_hal.py @@ -228,6 +228,10 @@ def classify_hal(node): if node.properties['storage.drive_type'] == 'tape': return 'TAPE'
+ if 'xen.type' in node.properties: + if node.properties['xen.type'] == 'vbd': + return 'HD' + #PRINTER if node.properties.has_key('printer.product'): return 'PRINTER' diff --git a/java/code/src/com/redhat/rhn/domain/server/Device.java b/java/code/src/com/redhat/rhn/domain/server/Device.java index 9370d88..58942cc 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Device.java +++ b/java/code/src/com/redhat/rhn/domain/server/Device.java @@ -40,6 +40,7 @@ public class Device extends BaseDomainHelper { public static final String BUS_USB = "USB"; public static final String BUS_VIO = "VIO"; public static final String BUS_PCI = "PCI"; + public static final String BUS_XEN = "XEN";
/** Constants for Device classes */ public static final String CLASS_AUDIO = "AUDIO";