virt-manager-4.1.0-2.el9
- virtinstall: fix regression with --boot and no install method (rhbz#2144885) Resolves: rhbz#2144885
This commit is contained in:
parent
ce8b68c40f
commit
8e280684ea
@ -0,0 +1,58 @@
|
||||
From afb42b86ad8bd72930859968c92c084134e6d114 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Sat, 20 Aug 2022 09:54:01 -0400
|
||||
Subject: [PATCH] virtinstall: fix regression with --boot and no install method
|
||||
|
||||
Anything passed to --boot should imply --install no_install=yes
|
||||
in the absence of other --install options. This is historically
|
||||
what we've done but we regressed in 4.1.0
|
||||
|
||||
Resolves: https://github.com/virt-manager/virt-manager/issues/426
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2144885
|
||||
|
||||
(cherry picked from commit e94786c066696781a821f5a4bcef3c377e4bc5e5)
|
||||
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
|
||||
---
|
||||
tests/test_cli.py | 1 +
|
||||
virtinst/virtinstall.py | 3 ++-
|
||||
2 files changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/test_cli.py b/tests/test_cli.py
|
||||
index 774db098f..ca8d2340a 100644
|
||||
--- a/tests/test_cli.py
|
||||
+++ b/tests/test_cli.py
|
||||
@@ -966,6 +966,7 @@ c.add_valid("--os-variant generic --pxe --ram 16", grep="Requested memory 16 MiB
|
||||
c.add_valid("--os-variant winxp --ram 32 --cdrom %(EXISTIMG1)s", grep="32 MiB is less than the recommended 64 MiB") # Windows. Catch memory warning
|
||||
c.add_valid("--osinfo generic --pxe --autostart") # --autostart flag
|
||||
c.add_valid("--cdrom %(EXISTIMG2)s --os-variant win2k3 --print-step 2") # HVM windows install, print 3rd stage XML
|
||||
+c.add_valid("--memory 512 --osinfo generic --boot cdrom") # --boot XXX should imply --install no_install
|
||||
c.add_compare("--location location=%(TREEDIR)s --initrd-inject virt-install --extra-args ks=file:/virt-install", "initrd-inject") # initrd-inject
|
||||
c.add_compare("--cdrom http://example.com/path/to/some.iso --os-variant detect=yes,require=no", "cdrom-url")
|
||||
c.add_compare("--pxe --print-step all --os-variant none", "simple-pxe") # Diskless PXE install
|
||||
diff --git a/virtinst/virtinstall.py b/virtinst/virtinstall.py
|
||||
index 6d7f56b8d..20b901813 100644
|
||||
--- a/virtinst/virtinstall.py
|
||||
+++ b/virtinst/virtinstall.py
|
||||
@@ -431,7 +431,7 @@ def build_installer(options, guest, installdata):
|
||||
pass
|
||||
elif (options.import_install or
|
||||
options.xmlonly or
|
||||
- options.boot or
|
||||
+ options.boot_was_set or
|
||||
options.cloud_init or
|
||||
options.unattended):
|
||||
no_install = True
|
||||
@@ -641,6 +641,7 @@ def _build_options_guest(conn, options):
|
||||
def build_guest_instance(conn, options):
|
||||
installdata = cli.parse_install(options.install)
|
||||
osdata = cli.parse_os_variant(options.os_variant or installdata.os)
|
||||
+ options.boot_was_set = bool(options.boot)
|
||||
|
||||
if options.reinstall:
|
||||
dummy1, guest, dummy2 = cli.get_domain_and_guest(conn, options.reinstall)
|
||||
--
|
||||
2.38.1
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
Name: virt-manager
|
||||
Version: 4.1.0
|
||||
Release: 1%{?dist}%{?extra_release}
|
||||
Release: 2%{?dist}%{?extra_release}
|
||||
%global verrel %{version}-%{release}
|
||||
|
||||
Summary: Desktop tool for managing virtual machines via libvirt
|
||||
@ -19,6 +19,7 @@ Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.ta
|
||||
Source1: symlinks
|
||||
|
||||
Patch1: virt-manager-cloner-Sync-uuid-and-sysinfo-system-uuid.patch
|
||||
Patch2: virt-manager-virtinstall-fix-regression-with-boot-and-no-install-method.patch
|
||||
|
||||
|
||||
Requires: virt-manager-common = %{verrel}
|
||||
@ -184,6 +185,9 @@ git config gc.auto 0
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Dec 5 2022 Jonathon Jongsma <jjongsma@redhat.com> - 4.1.0-2
|
||||
- virtinstall: fix regression with --boot and no install method (rhbz#2144885)
|
||||
|
||||
* Tue Nov 15 2022 Jonathon Jongsma <jjongsma@redhat.com> - 4.1.0-1
|
||||
- Rebased to virt-manager-4.1.0 (rhbz#2135791)
|
||||
- cloner: Sync <uuid> and <sysinfo> system uuid (rhbz#2038040)
|
||||
|
Loading…
Reference in New Issue
Block a user