Bootloader was being assigned incorrectly
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=458
This commit is contained in:
parent
b98808f5e4
commit
72aeea6cea
@ -5,9 +5,9 @@ Index: virt-manager-2.1.0/virtinst/installer.py
|
|||||||
--- virt-manager-2.1.0.orig/virtinst/installer.py
|
--- virt-manager-2.1.0.orig/virtinst/installer.py
|
||||||
+++ virt-manager-2.1.0/virtinst/installer.py
|
+++ virt-manager-2.1.0/virtinst/installer.py
|
||||||
@@ -312,7 +312,10 @@ class Installer(object):
|
@@ -312,7 +312,10 @@ class Installer(object):
|
||||||
guest.os.bootloader = "pygrub"
|
guest.bootloader = "pygrub"
|
||||||
else:
|
else:
|
||||||
guest.os.bootloader = None
|
guest.bootloader = None
|
||||||
- self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
- self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
||||||
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
|
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
|
||||||
+ self._install_kernel = "/usr/share/grub2/x86_64-xen/grub.xen"
|
+ self._install_kernel = "/usr/share/grub2/x86_64-xen/grub.xen"
|
||||||
|
@ -16,9 +16,9 @@ Index: virt-manager-2.1.0/virtinst/installer.py
|
|||||||
+ if guest.os.arch != 'x86_64' or os_ver.startswith("sles9") or \
|
+ if guest.os.arch != 'x86_64' or os_ver.startswith("sles9") or \
|
||||||
+ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
|
+ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
|
||||||
+ os_ver.startswith("opensuse10") or os_ver.startswith("opensuse11"):
|
+ os_ver.startswith("opensuse10") or os_ver.startswith("opensuse11"):
|
||||||
+ guest.os.bootloader = "pygrub"
|
+ guest.bootloader = "pygrub"
|
||||||
+ else:
|
+ else:
|
||||||
+ guest.os.bootloader = None
|
+ guest.bootloader = None
|
||||||
+ self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
+ self._install_kernel = "/usr/lib/grub2/x86_64-xen/grub.xen"
|
||||||
+ self._install_initrd = None
|
+ self._install_initrd = None
|
||||||
+ self.extraargs = None
|
+ self.extraargs = None
|
||||||
|
@ -63,7 +63,7 @@ Index: virt-manager-2.1.0/virtManager/addhardware.py
|
|||||||
|
|
||||||
|
|
||||||
def _build_combo(combo, values, default_value=None, sort=True):
|
def _build_combo(combo, values, default_value=None, sort=True):
|
||||||
@@ -890,7 +890,7 @@ class vmmAddHardware(vmmGObjectUI):
|
@@ -889,7 +889,7 @@ class vmmAddHardware(vmmGObjectUI):
|
||||||
self._dev = DeviceTpm(self.conn.get_backend())
|
self._dev = DeviceTpm(self.conn.get_backend())
|
||||||
self._dev.type = devtype
|
self._dev.type = devtype
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user