Roy Golan has uploaded a new change for review.

Change subject: core: osinfo - change OSs audio device
......................................................................

core: osinfo - change OSs audio device

Esentially old OSs[1] supports ac97 emulated sound device while all the
new supports ich6 - intell HD audio definition.

[1] RHEL 3,4,5, Windows XP, Windows 2003 32/64

Change-Id: I1a614d7be71cae8beaf1df36056b6945f84ae981
Bug-Url: https://bugzilla.redhat.com/1002695
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M packaging/conf/osinfo-defaults.properties
1 file changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/19300/1

diff --git a/packaging/conf/osinfo-defaults.properties 
b/packaging/conf/osinfo-defaults.properties
index e56160b..5eebf3f 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -44,7 +44,6 @@
 os.other.resources.minimum.disksize.value = 1
 os.other.resources.minimum.numberOsCpus.value = 1
 os.other.spiceSupport.value = true
-
 os.other.devices.audio.value = ich6
 # See VmInterfaceType.java
 os.other.devices.network.value =  rtl8139, e1000, pv
@@ -54,33 +53,32 @@
 os.linux.derivedFrom.value = other
 os.linux.description.value = General GNU/Linux
 os.linux.family.value = linux
-os.linux.devices.audio.value = ac97
-
 
 os.windows.id.value = 200
 os.windows.name.value = Windows
 os.windows.derivedFrom.value = other
 os.windows.description.value = General Windows OS
 os.windows.family.value = windows
-os.windows.devices.audio.value = ac97
 os.windows.sysprepPath.value = ""
 os.windows.productKey.value = ""
-
 
 # rhel3(9, OsType.Linux, false),
 os.rhel_3.id.value = 9
 os.rhel_3.name.value = Red Hat Enterprise Linux 3.x
 os.rhel_3.derivedFrom.value = linux
+os.rhel_3.devices.audio.value = ac97
 
 # rhel3x64(15, OsType.Linux, true),
 os.rhel_3x64.id.value = 15
 os.rhel_3x64.name.value = Red Hat Enterprise Linux 3.x x64
 os.rhel_3x64.derivedFrom.value = linux
+os.rhel_3x64.devices.audio.value = ac97
+
 
 # rhel4(8, OsType.Linux, false),
 os.rhel_4.id.value = 8
 os.rhel_4.name.value = Red Hat Enterprise Linux 4.x
-os.rhel_4.derivedFrom.value = linux
+os.rhel_4.derivedFrom.value = rhel3
 
 # RHEL4x64(14, OsType.Linux, true),
 os.rhel_4x64.id.value = 14
@@ -90,7 +88,7 @@
 # rhel5(7, OsType.Linux, false),
 os.rhel_5.id.value = 7
 os.rhel_5.name.value = Red Hat Enterprise Linux 5.x
-os.rhel_5.derivedFrom.value = linux
+os.rhel_5.derivedFrom.value = rhel_4
 
 # rhel_5x64(13, OsType.Linux, true),
 os.rhel_5x64.id.value = 13
@@ -102,12 +100,13 @@
 os.rhel_6.id.value = 18
 os.rhel_6.name.value = Red Hat Enterprise Linux 6.x
 os.rhel_6.derivedFrom.value = rhel_5
+os.rhel_6.devices.audio.value = ich6
 
 # rhel6x64(19, OsType.Linux, true),
 os.rhel_6x64.id.value = 19
 os.rhel_6x64.name.value = Red Hat Enterprise Linux 6.x x64
 os.rhel_6x64.derivedFrom.value = rhel_5x64
-
+os_rhel_6x64.devices.audio.value = ich6
 
 # WindowsXP(1, OsType.Windows, false),
 os.windows_xp.id.value = 1
@@ -117,6 +116,9 @@
 os.windows_xp.productKey.value =
 os.windows_xp.isTimezoneTypeInteger.value = true
 os.windows_xp.devices.network.value =  rtl8139_pv, rtl8139, e1000, pv
+os.windows_xp.devices.audio.value = ac97
+
+
 
 # Windows2003(3, OsType.Windows, false),
 os.windows_2003.id.value = 3
@@ -125,6 +127,8 @@
 os.windows_2003.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k3
 os.windows_2003.productKey.value =
 os.windows_2003.isTimezoneTypeInteger.value = true
+os.windows_2003.devices.audio.value = ac97
+
 
 # Windows2008(4, OsType.Windows, false),
 os.windows_2008.id.value = 4
@@ -132,6 +136,7 @@
 os.windows_2008.derivedFrom.value = windows_2003
 os.windows_2008.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k8
 os.windows_2008.productKey.value =
+os.windows_2008.devices.audio.value = ich6
 
 # Windows2003x64(10, OsType.Windows, true),
 os.windows_2003x64.id.value = 10
@@ -165,6 +170,8 @@
 os.windows_2008x64.derivedFrom.value = windows_2003x64
 os.windows_2008x64.sysprepPath.value = /etc/ovirt-engine/sysprep/sysprep.2k8x64
 os.windows_2008x64.productKey.value =
+os.windows_2008x64.devices.audio.value = ich6
+
 
 # os.Windows2008R2x64.derivedFrom.value = windows2008
 os.windows_2008R2x64.id.value = 17


-- 
To view, visit http://gerrit.ovirt.org/19300
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a614d7be71cae8beaf1df36056b6945f84ae981
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to