patches/virt-manager-09-create-arch.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 15942 40ffef79e81f
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446

/jds/bin/diff -uprN virt-manager-0.6.1.old/src/virtManager/create.py virt-manager-0.6.1/src/virtManager/create.py
--- virt-manager-0.6.1.old/src/virtManager/create.py	2009-04-17 13:04:42.116564080 +0100
+++ virt-manager-0.6.1/src/virtManager/create.py	2009-04-17 13:05:11.942148231 +0100
@@ -925,6 +925,9 @@ class vmmCreate(gobject.GObject):
                 os_type = "hvm"
             self._guest.installer = self.get_config_installer(self.get_domain_type(), os_type)
 
+            # Solaris: Reset arch back to selected arch...
+            self._guest.arch = self.get_domain_arch()
+
             try:
                 if self.get_config_os_type() is not None \
                    and self.get_config_os_type() != "generic":
@@ -946,6 +949,9 @@ class vmmCreate(gobject.GObject):
                 os_type = "hvm"
             self._guest.installer = self.get_config_installer(self.get_domain_type(), os_type)
 
+            # Solaris: Reset arch back to selected arch...
+            self._guest.arch = self.get_domain_arch()
+
             src = self.get_config_install_source()
             if not src:
                 return self.err.val_err(_("An install media path is required."))
@@ -1243,6 +1249,11 @@ class vmmCreate(gobject.GObject):
                 native = i
             i = i + 1
 
+        # Solaris: if host archictecture is not found in list of archs
+        # Ensure first item on list is selected as i86pc not supported
+        if native == -1 and i > 0:
+            native = 0
+
         return native