You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
os-autoinst/0001-Allow-special-value-on...

49 lines
2.0 KiB

From 2d6e71e8d2d6f61f109566ff3148d3b1aa50c68c Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 20 Aug 2019 15:39:04 -0700
Subject: [PATCH] Allow special value 'once' for PXEBOOT, to PXE boot...once
For a PXE install test, we want to boot PXE just the *first*
time, then revert to default boot order (much like we boot
once=d by default for optical media installs). This allows the
special value 'once' for the PXEBOOT var to request this.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
backend/qemu.pm | 5 ++++-
doc/backend_vars.asciidoc | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/backend/qemu.pm b/backend/qemu.pm
index ca576dd2..024e7a9a 100644
--- a/backend/qemu.pm
+++ b/backend/qemu.pm
@@ -792,7 +792,10 @@ sub start_qemu {
}
if ($arch_supports_boot_order) {
- if ($vars->{PXEBOOT}) {
+ if ($vars->{PXEBOOT} eq 'once') {
+ sp("boot", "once=n");
+ }
+ elsif ($vars->{PXEBOOT}) {
sp("boot", "n");
}
elsif ($vars->{BOOTFROM}) {
diff --git a/doc/backend_vars.asciidoc b/doc/backend_vars.asciidoc
index cd8b9345..746e74e0 100644
--- a/doc/backend_vars.asciidoc
+++ b/doc/backend_vars.asciidoc
@@ -78,7 +78,7 @@ OFW;boolean;0;QEMU Open Firmware is in use
QEMU_OVERRIDE_VIDEO_DEVICE_AARCH64;boolean;undef;If set, for aarch64 systems use VGA as video adapter
QEMU_DISABLE_SNAPSHOTS;boolean;undef;If set, disable snapshots in case the worker has slow disks to avoid save_vm calls failing due to timeouts (See https://bugzilla.suse.com/show_bug.cgi?id=1035453[bsc#1035453])
PATHCNT;integer;2;Number of paths in MULTIPATH scenario
-PXEBOOT;boolean;0;Boot VM from network
+PXEBOOT;boolean or 'once';0;Boot VM from network, on every boot or only once if set to 'once'
QEMU;QEMU binary filename;undef;Filename of QEMU binary to use
QEMUCPU;see qemu -cpu ?;undef;CPU to emulate
QEMUCPUS;integer;1;Number of CPUs to assign to VM
--
2.23.0.rc2