virt-manager/virtinst-change-location-for-grub_xen.patch

32 lines
1.5 KiB
Diff
Raw Normal View History

References: fate#326960, bsc#1123942
Index: virt-manager-4.0.0/virtinst/install/installer.py
===================================================================
--- virt-manager-4.0.0.orig/virtinst/install/installer.py
+++ virt-manager-4.0.0/virtinst/install/installer.py
@@ -592,7 +592,10 @@ class Installer(object):
guest.bootloader = "pygrub"
else:
guest.bootloader = None
- self._treemedia_bootconfig = ("/usr/lib/grub2/x86_64-xen/grub.xen", "", "")
+ if os.path.exists("/usr/share/grub2/x86_64-xen/grub.xen"):
+ self._treemedia_bootconfig = ("/usr/share/grub2/x86_64-xen/grub.xen", "", "")
+ else:
+ 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")
on_reboot_value = guest.on_reboot
self._alter_bootconfig(guest)
Index: virt-manager-4.0.0/virtManager/delete.py
===================================================================
--- virt-manager-4.0.0.orig/virtManager/delete.py
+++ virt-manager-4.0.0/virtManager/delete.py
@@ -459,7 +459,7 @@ def _populate_storage_list(storage_list,
- Update to virt-manager 3.0.0 (fate#326786) virt-manager-3.0.0.tar.bz2 * virt-install –cloud-init support (Athina Plaskasoviti, Cole Robinson) * The virt-convert tool has been removed. Please use virt-v2v instead * A handful of UI XML configuration options have been removed. The XML editor can be used instead. For a larger discussion see this thread: https://www.redhat.com/archives/virt-tools-list/ 2019-June/msg00117.html * The ‘New VM’ UI now has a ‘Manual Install’ option which creates a VM without any required install media * In the ‘New VM’ UI, the network/pxe install option has been removed. If you need network boot, choose ‘Manual Install’ and set the boot device after initial VM creation * ‘Clone VM’ UI has been reworked and simplified * ‘Migrate VM’ UI now has an XML editor for the destination VM * Global and per-vm option to disable graphical console autoconnect. This makes it easier to use virt-manager alongside another client like virt-viewer * virt-manager: set guest time after VM restore (Michael Weiser) * virt-manager: option to delete storage when removing disk device (Lily Nie) * virt-manager: show warnings if snapshot operation is unsafe (Michael Weiser) * Unattended install improvements (Fabiano Fidêncio) * cli: new –xml XPATH=VAL option for making direct XML changes * virt-install: new –reinstall=DOMAIN option * virt-install: new –autoconsole text|graphical|none option * virt-install: new –os-variant detect=on,require=on suboptions OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=509
2020-09-16 19:23:41 +02:00
model.clear()
- Update to virt-manager 3.0.0 (fate#326786) virt-manager-3.0.0.tar.bz2 * virt-install –cloud-init support (Athina Plaskasoviti, Cole Robinson) * The virt-convert tool has been removed. Please use virt-v2v instead * A handful of UI XML configuration options have been removed. The XML editor can be used instead. For a larger discussion see this thread: https://www.redhat.com/archives/virt-tools-list/ 2019-June/msg00117.html * The ‘New VM’ UI now has a ‘Manual Install’ option which creates a VM without any required install media * In the ‘New VM’ UI, the network/pxe install option has been removed. If you need network boot, choose ‘Manual Install’ and set the boot device after initial VM creation * ‘Clone VM’ UI has been reworked and simplified * ‘Migrate VM’ UI now has an XML editor for the destination VM * Global and per-vm option to disable graphical console autoconnect. This makes it easier to use virt-manager alongside another client like virt-viewer * virt-manager: set guest time after VM restore (Michael Weiser) * virt-manager: option to delete storage when removing disk device (Lily Nie) * virt-manager: show warnings if snapshot operation is unsafe (Michael Weiser) * Unattended install improvements (Fabiano Fidêncio) * cli: new –xml XPATH=VAL option for making direct XML changes * virt-install: new –reinstall=DOMAIN option * virt-install: new –autoconsole text|graphical|none option * virt-install: new –os-variant detect=on,require=on suboptions OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=509
2020-09-16 19:23:41 +02:00
for diskdata in diskdatas:
- if not diskdata.path or diskdata.path == "/usr/lib/grub2/x86_64-xen/grub.xen":
+ if not diskdata.path or "grub.xen" in diskdata.path:
continue
# There are a few pieces here