diff --git a/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml b/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml index 5fe5d87..a798b6e 100644 --- a/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/config-sample.yaml @@ -42,10 +42,13 @@ # * secure[-4m] # "firmware": "uefi" + # Whether to show a boot menu. + # "bootMenu": false + # When terminating, a graceful powerdown is attempted. If it # doesn't succeed within the given timeout (seconds) SIGTERM # is sent to Qemu. - # "powerdownTimeout": 60 + # "powerdownTimeout": 900 # RAM settings # "maximumRam": "1G" diff --git a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java index 48d6a93..c8b9189 100644 --- a/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java +++ b/org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java @@ -114,6 +114,7 @@ class Configuration implements Dto { public String name; public String uuid; public boolean useTpm; + public boolean bootMenu; public String firmware = "uefi"; public BigInteger maximumRam; public BigInteger currentRam; @@ -127,7 +128,7 @@ class Configuration implements Dto { public String accelerator = "kvm"; public String rtcBase = "utc"; public String rtcClock = "rt"; - public int powerdownTimeout = 60; + public int powerdownTimeout = 900; public Network[] network = { new Network() }; public Drive[] drives; public Spice spice; diff --git a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml index febe780..567541a 100644 --- a/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml +++ b/org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml @@ -67,6 +67,9 @@ <#if vm.firmware?starts_with("secure")> - [ "-global", "driver=cfi.pflash01,property=secure,value=on" ] + <#if vm.bootMenu> + - [ "-boot", "menu=on" ] + # * Provide RAM - [ "-object", "memory-backend-ram,id=pc.ram,\ size=${ (vm.maximumRam!1073741824)?c }" ]