Merge pull request #12564 from mihalicyn/edk2_csm_bootorder

VM: Support bootorder in edk2 CSM mode
canonical · Nov 28, 2023 · b373fce · b373fce
2 parents 4d95237 + f3a5e8a
commit b373fce
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lxd/instance/drivers/driver_qemu.go b/lxd/instance/drivers/driver_qemu.go
@@ -1459,6 +1459,11 @@ func (d *qemu) start(stateful bool, op *operationlock.InstanceOperation) error {
 		qemuCmd = append(qemuCmd, "-debugcon", "file:"+d.EDK2LogFilePath(), "-global", "isa-debugcon.iobase=0x402")
 	}
 
+	// This feature specific to the snap-shipped CSM edk2 version, because we have a custom patch to make it work.
+	if shared.InSnap() && shared.IsTrue(d.expandedConfig["security.csm"]) {
+		qemuCmd = append(qemuCmd, "-fw_cfg", "name=opt/com.canonical.lxd/force_csm,string=yes")
+	}
+
 	// If stateful, restore now.
 	if stateful {
 		if !d.stateful {