7eef83f602
- diskbackend: Drop support for sheepdog
- cli: support --boot loader.stateless=
- virt-install: Reuse cli.fail_conflicting
- virt-install: --unattended and --cloud-init conflict
- cloner: Sync and system uuid
- virt-install: --help required options are wrong
- cli: --cpu: Add maxphysaddr.{mode,bits} options
- tests: Add a compat check for linux2020 in amd-sev test case
- virtinstall: fix regression with --boot and no install method
- virtinstall: split no_install conditional apart to track code coverage
(cherry picked from commit 4f34c95ba5fb8bffd8c4bd183506972a7cbf2828)
54 lines
2.5 KiB
Diff
54 lines
2.5 KiB
Diff
From e94786c066696781a821f5a4bcef3c377e4bc5e5 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>
|
|
---
|
|
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 72b78df3..cc1d3da2 100644
|
|
--- a/tests/test_cli.py
|
|
+++ b/tests/test_cli.py
|
|
@@ -967,6 +967,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 32434119..baebe5b5 100644
|
|
--- a/virtinst/virtinstall.py
|
|
+++ b/virtinst/virtinstall.py
|
|
@@ -433,7 +433,7 @@ def build_installer(options, guest, installdata):
|
|
no_install = True
|
|
elif options.import_install:
|
|
no_install = True
|
|
- elif options.boot:
|
|
+ elif options.boot_was_set:
|
|
no_install = True
|
|
elif options.cloud_init:
|
|
no_install = True
|
|
@@ -645,6 +645,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.37.2.windows.2
|
|
|