port veritymount forward to separated verity partition

1 files changed, 6 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 2a49c6a..65fdd9a 100644
--- a/Makefile
+++ b/Makefile
@@ -204,24 +204,23 @@ get_loop_dev="$$(sudo losetup -n -O name -j $@~tmp)"
 get_backing_file="$$(sudo losetup -n -O back-file -j $@~tmp)"
 get_min_size="$$(btrfs inspect-internal min-dev-size --id 1 $@.mnt | (read b _; echo $$b))"
 
-%.verity.sh: %.verity
-        h=$$(sed -ne 's/^Root hash:[ \t]*//p' $<.log) && [ "$$h" ] && \
-                printf 'verity_root_hash=%s\nverity_hash_offset=%s\n' "$$h" $(shell stat -c %s $(basename $<)) > $@
+verity_root_hash = $(shell sed -ne 's/^Root hash:[ \t]*//p' $<)
 
 %.verity.log: %.verity
 %.verity: %
         rm -f $@~tmp
         sudo veritysetup format $^ $@~tmp > $@.log~tmp
+        sudo chmod 644 $@~tmp
         mv $@.log~tmp $@.log
         mv $@~tmp $@
-        sudo chmod 644 $@
 
 root_hash = $(shell sed -ne 's/^Root hash: *//p' < $<.log)
 
-veritymount: rootfs/samizdat.seed.btrfs.verity.sh
+veritymount: rootfs/samizdat.seed.btrfs.verity.log
         @sudo veritysetup remove samizverity >/dev/null 2>&1 || true
-        set -x && . $< && sudo veritysetup --ignore-corruption --hash-offset=$$verity_hash_offset \
-                create samizverity $(basename $<) $(basename $<) $$verity_root_hash
+        sudo veritysetup create samizverity $(basename $(basename $<)) \
+                              $(basename $<) \
+                              $(verity_root_hash)
         sudo veritysetup remove samizverity
 
 %.verity.log.asc: %.verity.log