2015-05-04 22:15:01 +02:00
|
|
|
Reference: bnc#863821
|
|
|
|
grub.xen is required to boot PV VMs that use the BTRFS filesystem.
|
|
|
|
This patch forces the use of grub.xen (instead of using pygrub) for
|
2018-10-30 23:00:52 +01:00
|
|
|
suse distros SLE12GA, openSUSE 13.2, and newer.
|
2019-10-28 18:01:55 +01:00
|
|
|
Index: virt-manager-2.2.1/virtinst/install/installer.py
|
2014-03-24 16:05:15 +01:00
|
|
|
===================================================================
|
2019-10-28 18:01:55 +01:00
|
|
|
--- virt-manager-2.2.1.orig/virtinst/install/installer.py
|
|
|
|
+++ virt-manager-2.2.1/virtinst/install/installer.py
|
2019-11-27 23:13:48 +01:00
|
|
|
@@ -167,7 +167,8 @@ class Installer(object):
|
|
|
|
|
|
|
|
def _alter_treemedia_bootconfig(self, guest):
|
|
|
|
if not self._treemedia:
|
|
|
|
- return
|
|
|
|
+ if not self._treemedia_bootconfig or "grub.xen" not in self._treemedia_bootconfig[0]:
|
|
|
|
+ return
|
|
|
|
|
|
|
|
kernel, initrd, kernel_args = self._treemedia_bootconfig
|
|
|
|
if kernel:
|
|
|
|
@@ -436,6 +437,20 @@ class Installer(object):
|
2018-10-30 23:00:52 +01:00
|
|
|
install_xml = None
|
|
|
|
if self.has_install_phase():
|
- bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended
option leaks password via command line argument
58c68764-unattended-Read-the-passwords-from-a-file.patch
51d28f04-unattended-Dont-log-user-admin-passwords.patch
- Upstream bug fix (bsc#1027942)
5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch
- Update to virt-manager 2.2.0 (fate#326786)
virt-manager-2.2.0.tar.bz2
* libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks
* virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson)
* Improve CPU model security defaults (Pavel Hrdina)
* virt-install: new –install option. Ex: virt-install –install fedora29
* virt-install: new –install kernel=,initrd=
* virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson)
* virt-install: add device suboption aliases which consistently match libvirt XML naming
* virt-xml: new –start, –no-define options (Marc Hartmayer)
* virt-install: Add driver_queues argument to –controller (Vasudeva Kamath)
* RISC-V support (Andrea Bolognani)
* Device default improvements for non-x86 KVM (Andrea Bolognani)
* Redesigned ‘New Network’ wizard
* libguestfs inspection improvements (Pino Toscano)
* virt-install: Add support for xenbus controller (Jim Fehlig)
* cli: Add –disk wwn=,rawio= (Athina Plaskasoviti)
* cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti)
* cli: Add –iothreads (Athina Plaskasoviti)
* cli: Add –numatune memory.placement (Athina Plaskasoviti)
* cli: Add –launchSecurity option (Erik Skultety)
* cli: Fill in –memorybacking options
* cli: –smartcard: support database= and certificate[0-9]*=
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 20:19:42 +02:00
|
|
|
install_xml = self._get_install_xml(guest, meter)
|
2018-10-30 23:00:52 +01:00
|
|
|
+ if (guest.os.is_xenpv() and
|
|
|
|
+ not guest.os.kernel):
|
|
|
|
+ os_ver = guest.osinfo.name
|
|
|
|
+ if guest.os.arch != 'x86_64' or os_ver.startswith("sles9") or \
|
2017-01-06 23:04:32 +01:00
|
|
|
+ os_ver.startswith("sles10") or os_ver.startswith("sled10") or \
|
|
|
|
+ os_ver.startswith("opensuse10") or os_ver.startswith("opensuse11"):
|
2019-02-13 00:00:26 +01:00
|
|
|
+ guest.bootloader = "pygrub"
|
2017-01-06 23:04:32 +01:00
|
|
|
+ else:
|
2019-02-13 00:00:26 +01:00
|
|
|
+ guest.bootloader = None
|
2019-10-28 18:01:55 +01:00
|
|
|
+ self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "")
|
- bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended
option leaks password via command line argument
58c68764-unattended-Read-the-passwords-from-a-file.patch
51d28f04-unattended-Dont-log-user-admin-passwords.patch
- Upstream bug fix (bsc#1027942)
5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch
- Update to virt-manager 2.2.0 (fate#326786)
virt-manager-2.2.0.tar.bz2
* libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks
* virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson)
* Improve CPU model security defaults (Pavel Hrdina)
* virt-install: new –install option. Ex: virt-install –install fedora29
* virt-install: new –install kernel=,initrd=
* virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson)
* virt-install: add device suboption aliases which consistently match libvirt XML naming
* virt-xml: new –start, –no-define options (Marc Hartmayer)
* virt-install: Add driver_queues argument to –controller (Vasudeva Kamath)
* RISC-V support (Andrea Bolognani)
* Device default improvements for non-x86 KVM (Andrea Bolognani)
* Redesigned ‘New Network’ wizard
* libguestfs inspection improvements (Pino Toscano)
* virt-install: Add support for xenbus controller (Jim Fehlig)
* cli: Add –disk wwn=,rawio= (Athina Plaskasoviti)
* cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti)
* cli: Add –iothreads (Athina Plaskasoviti)
* cli: Add –numatune memory.placement (Athina Plaskasoviti)
* cli: Add –launchSecurity option (Erik Skultety)
* cli: Fill in –memorybacking options
* cli: –smartcard: support database= and certificate[0-9]*=
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 20:19:42 +02:00
|
|
|
+ log.debug("Using grub.xen to boot guest")
|
2019-11-22 21:56:15 +01:00
|
|
|
+ on_reboot_value = guest.on_reboot
|
2018-10-30 23:00:52 +01:00
|
|
|
+ self._alter_bootconfig(guest)
|
2019-11-22 21:56:15 +01:00
|
|
|
+ guest.on_reboot = on_reboot_value
|
2018-10-30 23:00:52 +01:00
|
|
|
final_xml = guest.get_xml()
|
2014-03-24 16:05:15 +01:00
|
|
|
|
- bsc#1140211 - VUL-1: CVE-2019-10183: virt-manager: unattended
option leaks password via command line argument
58c68764-unattended-Read-the-passwords-from-a-file.patch
51d28f04-unattended-Dont-log-user-admin-passwords.patch
- Upstream bug fix (bsc#1027942)
5312a961-virt-install-Revive-wait-0-as-alias-for-noautoconsole.patch
- Update to virt-manager 2.2.0 (fate#326786)
virt-manager-2.2.0.tar.bz2
* libvirt XML viewing and editing UI for new and existing domain, pools, volumes, networks
* virt-install: libosinfo –unattended support (Fabiano Fidêncio, Cole Robinson)
* Improve CPU model security defaults (Pavel Hrdina)
* virt-install: new –install option. Ex: virt-install –install fedora29
* virt-install: new –install kernel=,initrd=
* virt-install: –disk, –memory, –name defaults from libosinfo (Fabiano Fidêncio, Cole Robinson)
* virt-install: add device suboption aliases which consistently match libvirt XML naming
* virt-xml: new –start, –no-define options (Marc Hartmayer)
* virt-install: Add driver_queues argument to –controller (Vasudeva Kamath)
* RISC-V support (Andrea Bolognani)
* Device default improvements for non-x86 KVM (Andrea Bolognani)
* Redesigned ‘New Network’ wizard
* libguestfs inspection improvements (Pino Toscano)
* virt-install: Add support for xenbus controller (Jim Fehlig)
* cli: Add –disk wwn=,rawio= (Athina Plaskasoviti)
* cli: Add –memballoon autodeflate=,stats.period= (Athina Plaskasoviti)
* cli: Add –iothreads (Athina Plaskasoviti)
* cli: Add –numatune memory.placement (Athina Plaskasoviti)
* cli: Add –launchSecurity option (Erik Skultety)
* cli: Fill in –memorybacking options
* cli: –smartcard: support database= and certificate[0-9]*=
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=476
2019-07-03 20:19:42 +02:00
|
|
|
log.debug("Generated install XML: %s",
|