Skip to content

Commit e32a417

Browse files
targets/qemu.mk: Fix skip-if-exist in swtpm_setup
Commit 46cad54 ("WiP flake.nix: make docker image usable for...") added 'root' to the swtpm_setup call, but broke skip-if-exist because the flags are supposed to be comma-separated. swtpm_setup was ignoring skip-if-exist and would fail if the config files exist. Put a comma there so it works again. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
1 parent de0bc75 commit e32a417

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

targets/qemu.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ endif
1616

1717
ifeq "$(CONFIG_TPM2_TSS)" "y"
1818
SWTPM_TPMVER := --tpm2
19-
SWTPM_PRESETUP := swtpm_setup --create-config-files root skip-if-exist
19+
SWTPM_PRESETUP := swtpm_setup --create-config-files root,skip-if-exist
2020
else
2121
# TPM1 is the default
2222
SWTPM_TPMVER :=
@@ -111,4 +111,4 @@ run: $(TPMDIR)/.manufacture $(ROOT_DISK_IMG) $(MEMORY_SIZE_FILE) $(USB_FD_IMG)
111111
$(QEMU_USB_TOKEN_DEV) \
112112

113113
stty sane
114-
@echo
114+
@echo

0 commit comments

Comments
 (0)