Eli Mesika has uploaded a new change for review.

Change subject: core: change other OS to 64bit
......................................................................

core: change other OS to 64bit

Currently the default for the "other" OS is 32bit
This patch uses the following OS heirarchy and changing accordingly the
"other" OS to be 64bit

other
        other linux
                SUSE
                RH3
                        RH4
                                RH5
                                        RH6
                RH3 64
                        RH4 64
                                RH5 64
                                        RH6 64
                                                RH7 64
                Ubuntu 1204
                        Debian
                        Ubuntu 1210
                        Ubuntu 1304
                                Ubuntu 1310
                                        Ubuntu 1404
        other PPC 64
                Linux PPC 64
                        Ubuntu PPC 64
        FreeBSD
                FreeBSD 64
        XP
                Win 7
                        Win 7 64
                                Win 8 64
                Win 8
                Win 2003
                        Win 2008
                        Win 2003 64
                                Win 2008 64
                                        Win 2008 R2 64
                                        Win 2012 64

Change-Id: Ie2c3eb1d64145b9ee372deda01168f0b9732375b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1133642
Signed-off-by: emesika <[email protected]>
---
M packaging/conf/osinfo-defaults.properties
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/38280/1

diff --git a/packaging/conf/osinfo-defaults.properties 
b/packaging/conf/osinfo-defaults.properties
index e336e2a..484c89e 100644
--- a/packaging/conf/osinfo-defaults.properties
+++ b/packaging/conf/osinfo-defaults.properties
@@ -46,7 +46,7 @@
 
 os.other.cpuArchitecture.value = x86_64
 
-os.other.bus.value = 32
+os.other.bus.value = 64
 os.other.resources.minimum.ram.value = 256
 os.other.resources.maximum.ram.value = 65536
 os.other.resources.minimum.disksize.value = 1
@@ -86,6 +86,7 @@
 
 # rhel3(9, OsType.Linux, false),
 os.rhel_3.id.value = 9
+os.rhel_3.bus.value = 32
 os.rhel_3.name.value = Red Hat Enterprise Linux 3.x
 os.rhel_3.derivedFrom.value = other_linux
 os.rhel_3.devices.audio.value = ac97
@@ -105,6 +106,7 @@
 
 # rhel4(8, OsType.Linux, false),
 os.rhel_4.id.value = 8
+os.rhel_4.bus.value = 32
 os.rhel_4.name.value = Red Hat Enterprise Linux 4.x
 os.rhel_4.derivedFrom.value = rhel_3
 
@@ -116,6 +118,7 @@
 
 # rhel5(7, OsType.Linux, false),
 os.rhel_5.id.value = 7
+os.rhel_5.bus.value = 32
 os.rhel_5.name.value = Red Hat Enterprise Linux 5.x
 os.rhel_5.derivedFrom.value = rhel_4
 
@@ -123,11 +126,11 @@
 os.rhel_5x64.id.value = 13
 os.rhel_5x64.name.value = Red Hat Enterprise Linux 5.x x64
 os.rhel_5x64.derivedFrom.value = rhel_4x64
-os.rhel_5x64.bus.value = 64
 os.rhel_5x64.resources.maximum.ram.value = 1048576
 
 # rhel6(18, OsType.Linux, false),
 os.rhel_6.id.value = 18
+os.rhel_6.bus.value = 32
 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
@@ -151,6 +154,7 @@
 
 # WindowsXP(1, OsType.Windows, false),
 os.windows_xp.id.value = 1
+os.windows_xp.bus.value = 32
 os.windows_xp.name.value = Windows XP
 os.windows_xp.derivedFrom.value = other
 os.windows_xp.sysprepPath.value = ${ENGINE_USR}/conf/sysprep/sysprep.xp
@@ -203,6 +207,7 @@
 # Windows7(11, OsType.Windows, false),false
 os.windows_7.id.value = 11
 os.windows_7.name.value = Windows 7
+os.windows_7.bus.value = 32
 os.windows_7.derivedFrom.value = windows_xp
 os.windows_7.sysprepPath.value = ${ENGINE_USR}/conf/sysprep/sysprep.w7
 os.windows_7.sysprepFileName.value = Unattend.xml
@@ -252,7 +257,6 @@
 # Windows8x64(21, OsType.Windows, true),
 os.windows_8x64.id.value = 21
 os.windows_8x64.name.value = Windows 8 x64
-os.windows_8x64.bus.value = 64
 os.windows_8x64.derivedFrom.value = windows_7x64
 os.windows_8x64.sysprepPath.value = ${ENGINE_USR}/conf/sysprep/sysprep.w8x64
 os.windows_8x64.productKey.value =
@@ -311,6 +315,7 @@
 
 #FreeBSD
 os.freebsd.id.value = 1500
+os.freebsd.bus.value = 32
 os.freebsd.name.value = FreeBSD 9.2
 os.freebsd.derivedFrom.value = other
 
@@ -324,7 +329,6 @@
 os.other_ppc64.name.value = Other OS
 os.other_ppc64.derivedFrom.value = other
 os.other_ppc64.cpuArchitecture.value = ppc64
-os.other_ppc64.bus.value = 64
 os.other_ppc64.devices.network.value = pv, spaprVlan, e1000, rtl8139
 os.other_ppc64.devices.cdInterface.value = scsi
 os.other_ppc64.devices.balloon.enabled.value = false


-- 
To view, visit https://gerrit.ovirt.org/38280
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2c3eb1d64145b9ee372deda01168f0b9732375b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Eli Mesika <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to