From c08551a63baa3cab98a6172cb819f7b8b62ba0d0 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Tue, 23 Feb 2021 22:05:53 -0500 Subject: key-only mode for partvi; integrated partvi These commands are available in sami: make upgrade make emu make key They use partvi. --- src/partvi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/partvi') diff --git a/src/partvi b/src/partvi index e35169e..ddf4e45 100755 --- a/src/partvi +++ b/src/partvi @@ -207,6 +207,7 @@ create_ptable_conf() partition-table) start=$((start + devsz)); return;; efi-system-partition) typecode=C12A7328-F81F-11D2-BA4B-00A0C93EC93B ;; dm-verity-data|dm-verity-hashes) + check_for_key_only_skip || return 0 case "$name" in samizdat-rootfs|samizdat-root-patch) typecode=4f68bce3-e8cd-4db1-96e7-fbcaf984b709 ;; samizdat-root-patch-verity) typecode=2c7357ed-ebd2-46d9-aec1-23d437ec2bf5 ;; @@ -319,10 +320,20 @@ pee_on_table() $sudo sfdisk -Y dos "$dev" < "$DOS_TABLE_FILE" || return } +check_for_key_only_skip() +{ + [ "$KEY_ONLY" ] || return 0 + case "$type" in + dm-verity-data|dm-verity-hashes) false ;; + *) true ;; + esac +} clone_parts_to_target() { - f=$(readlink -e _build/"${f%.conf}") || break + + check_for_key_only_skip || return 0 + f=$(readlink -e _build/"${f%.conf}") || return ficlonerange.py "$f" "$target" } -- cgit v1.2.3