diff options
author | Andrew Cady <d@jerkface.net> | 2021-02-25 16:01:35 -0500 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2021-02-25 16:01:35 -0500 |
commit | 61a047b623e86334546e510717dd68cb482f932b (patch) | |
tree | 77510dd771ef8472b2e88d0f7df938d139b86c90 /partitions | |
parent | 232e75824980bd2b92c9a2add7029866fdb5da41 (diff) |
partvi: fixes related to key-only mode
fixed race condition in kpartx
fix for sfdisk kernel reload ptable failure
cleaned up some code duplication
created make keymu target
amended make clean target
Diffstat (limited to 'partitions')
-rw-r--r-- | partitions/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/partitions/Makefile b/partitions/Makefile index a1a7fea..f8ef259 100644 --- a/partitions/Makefile +++ b/partitions/Makefile | |||
@@ -9,17 +9,22 @@ whole.img: | |||
9 | key.img: | 9 | key.img: |
10 | partvi key | 10 | partvi key |
11 | 11 | ||
12 | .PHONY: usb emu key | 12 | .PHONY: usb emu key emu-key keymu |
13 | usb: whole.img | 13 | usb: whole.img |
14 | usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb" | 14 | usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb" |
15 | 15 | ||
16 | emu = qemu-system-x86_64 -m 800 -enable-kvm -boot c | ||
17 | |||
16 | emu: whole.img | 18 | emu: whole.img |
17 | qemu-system-x86_64 -m 800 -enable-kvm -boot c "$<" | 19 | $(emu) $< |
20 | |||
21 | emu-key keymu: key.img | ||
22 | $(emu) $< | ||
18 | 23 | ||
19 | key: key.img | 24 | key: key.img |
20 | usb=$$(usb) && \ | 25 | usb=$$(usb) && \ |
21 | sudo dd status=progress bs=1048576 if="$<" of="$$usb" && \ | 26 | sudo dd status=progress bs=1048576 if="$<" of="$$usb" && \ |
22 | sudo qemu-system-x86_64 -m 800 -enable-kvm -boot c "$$usb" | 27 | sudo $(emu) "$$usb" |
23 | 28 | ||
24 | clean: | 29 | clean: |
25 | rm -rf _build whole.img | 30 | rm -rf _build whole.img key.img |